Merge branch 'master' into opcache-memory-after-shm-setup

Author: TimWolla

.github/actions/freebsd/action.yml

@@ -9,7 +9,7 @@ runs:
     - name: FreeBSD
       uses: vmactions/freebsd-vm@v1
       with:
-        release: '13.3'
+        release: '13.5'
         usesh: true
         copyback: false
         # Temporarily disable sqlite, as FreeBSD ships it with disabled double quotes. We'll need to fix our tests.

.github/workflows/push.yml

@@ -198,7 +198,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: 14
+          - os: 15
             arch: ARM64
     name: MACOS_${{ matrix.arch }}_DEBUG_NTS
     runs-on: macos-${{ matrix.os }}

NEWS

@@ -15,6 +15,22 @@ PHP                                                                        NEWS
   . Disallow changing opcache.memory_consumption when SHM is already set up.
     (timwolla)
 
+- OpenSSL:
+  . Add $digest_algo parameter to openssl_public_encrypt() and
+    openssl_private_decrypt() functions. (Jakub Zelenka)
+
+- Reflection:
+  . Fixed bug GH-19187 (ReflectionNamedType::getName() prints nullable type when
+    retrieved from ReflectionProperty::getSettableType()). (ilutov)
+
+- Session:
+  . Fixed GH-19197: build broken with ZEND_STRL usage with memcpy
+    when implemented as macro. (David Carlier)
+
+- Soap:
+  . Fixed bug GH-19226 (Segfault when spawning new thread in soap extension).
+    (Florian Engelhardt)
+
 - Sockets:
   . socket_set_option for multicast context throws a ValueError
     when the socket family is not of AF_INET/AF_INET6 family. (David Carlier)
@@ -23,6 +39,8 @@ PHP                                                                        NEWS
   . Add HEIF/HEIC support to getimagesize. (Benstone Zhang)
   . Implement #71517 (Implement SVG support for getimagesize() and friends).
     (nielsdos)
+  . Optimized PHP html_entity_decode function. (Artem Ukrainskiy)
+  . Minor optimization to array_chunk(). (nielsdos)
 
 - URI:
   . Empty host handling is fixed. (Máté Kocsis)
@@ -249,6 +267,7 @@ PHP                                                                        NEWS
     zval for uninitialized typed properties). (nielsdos)
   . Fixed bug GH-15766 (ReflectionClass::toString() should have better output
     for enums). (DanielEScherzer)
+  . Added ReflectionProperty::getMangledName() method. (alexandre-daubois)
 
 - Session:
   . session_start() throws a ValueError on option argument if not a hashmap

UPGRADING

@@ -327,6 +327,10 @@ PHP 8.5 UPGRADE NOTES
 - libxml:
   . libxml_set_external_entity_loader() now has a formal return type of true.
 
+- OpenSSL:
+  . openssl_public_encrypt() and openssl_private_decrypt() have new parameter
+    $digest_algo that allows specifying hash digest algorith for OEAP padding.
+
 - PCNTL:
   . pcntl_exec() now has a formal return type of false.
   . pcntl_waitid() takes an additional resource_usage argument to
@@ -381,7 +385,7 @@ PHP 8.5 UPGRADE NOTES
 - Sockets:
   . socket_create_listen, socket_bind and socket_sendto throw a
     ValueError if the port is lower than 0 or greater than 65535,
-    also if any of the hints array entry is indexes numerically.
+    and also if any of the hints array entries are indexed numerically.
   . socket_addrinfo_lookup throws a TypeError if any of the hints
     values cannot be cast to int and can throw a ValueError if
     any of these values overflow.
@@ -421,6 +425,7 @@ PHP 8.5 UPGRADE NOTES
   . The clone language construct is now a function and supports reassigning
     (readonly) properties during cloning via the new $withProperties parameter.
     RFC: https://wiki.php.net/rfc/clone_with_v2
+  . Added Closure::getCurrent() to receive currently executing closure.
 
 - Curl:
   . curl_multi_get_handles() allows retrieving all CurlHandles current
@@ -466,6 +471,7 @@ PHP 8.5 UPGRADE NOTES
     ReflectionConstant::getExtensionName() were introduced.
   . ReflectionConstant::getAttributes() was introduced.
     RFC: https://wiki.php.net/rfc/attributes-on-constants
+  . ReflectionProperty::getMangledName() was introduced.
 
 - Sqlite:
   . Sqlite3Stmt::busy to check if a statement had been fetched
@@ -505,7 +511,7 @@ PHP 8.5 UPGRADE NOTES
     CURLFOLLOW_FIRSTONLY.
 
 - Fileinfo:
-  . Upgraded to file 5.46.
+  . Upgraded file from 5.45 to 5.46.
   . The return type of finfo_close() has been changed to true, rather
     than bool.
 
@@ -520,7 +526,7 @@ PHP 8.5 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/url_parsing_api
 
 - PCRE:
-  . Upgraded to pcre2lib from 10.44 to 10.45.
+  . Upgraded pcre2lib from 10.44 to 10.45.
 
 - PDO_Sqlite:
   . Increased minimum release version support from 3.7.7 to 3.7.17.
@@ -699,6 +705,7 @@ PHP 8.5 UPGRADE NOTES
   . Improved unpack() performance with nameless repetitions by avoiding
     creating temporary strings and reparsing them.
   . Improved pack() performance.
+  . Minor improvements in array_chunk() performance.
 
 - XMLReader:
   . Improved property access performance.

Zend/tests/asymmetric_visibility/gh19044.phpt

@@ -0,0 +1,24 @@
+--TEST--
+GH-19044: Protected properties must be scoped according to their prototype (protected(set) on non-hooked property)
+--FILE--
+<?php
+
+class P {
+    public mixed $foo { get => 42; }
+}
+
+class C1 extends P {
+    public protected(set) mixed $foo = 1;
+}
+
+class C2 extends P {
+    public protected(set) mixed $foo;
+
+    static function foo($c) { return $c->foo += 1; }
+}
+
+var_dump(C2::foo(new C1));
+
+?>
+--EXPECT--
+int(43)

Zend/tests/closures/closure_get_current.phpt

@@ -0,0 +1,64 @@
+--TEST--
+Closure::getCurrent()
+--FILE--
+<?php
+
+$i = 1;
+
+$c = function ($p) use (&$i) {
+    $self = Closure::getCurrent();
+    var_dump($p, $i);
+    $i++;
+    if ($p < 10) {
+        $self($p + 1);
+    }
+};
+
+$c(1);
+var_dump($i);
+
+function fail() {
+    Closure::getCurrent();
+}
+
+try {
+    fail();
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+function foo() {
+    var_dump(Closure::getCurrent());
+}
+
+try {
+    foo(...)();
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+int(1)
+int(1)
+int(2)
+int(2)
+int(3)
+int(3)
+int(4)
+int(4)
+int(5)
+int(5)
+int(6)
+int(6)
+int(7)
+int(7)
+int(8)
+int(8)
+int(9)
+int(9)
+int(10)
+int(10)
+int(11)
+Current function is not a closure
+Current function is not a closure

Zend/tests/gh18581.phpt

@@ -0,0 +1,32 @@
+--TEST--
+GH-18581: Coerce numeric string keys from iterators when argument unpacking
+--FILE--
+<?php
+
+function g() {
+    yield '100' => 'first';
+    yield '101' => 'second';
+    yield '102' => 'third';
+    yield 'named' => 'fourth';
+}
+
+function test($x = null, $y = null, ...$z) {
+    var_dump($x, $y, $z);
+    var_dump($z[0]);
+    var_dump($z['named']);
+}
+
+test(...g());
+
+?>
+--EXPECT--
+string(5) "first"
+string(6) "second"
+array(2) {
+  [0]=>
+  string(5) "third"
+  ["named"]=>
+  string(6) "fourth"
+}
+string(5) "third"
+string(6) "fourth"

Zend/tests/gh19044.phpt

@@ -0,0 +1,26 @@
+--TEST--
+GH-19044: Protected properties must be scoped according to their prototype
+--FILE--
+<?php
+
+abstract class P {
+    protected $foo;
+}
+
+class C1 extends P {
+    protected $foo = 1;
+}
+
+class C2 extends P {
+    protected $foo = 2;
+    
+    static function foo($c) { return $c->foo; }
+}
+
+var_dump(C2::foo(new C2));
+var_dump(C2::foo(new C1));
+
+?>
+--EXPECT--
+int(2)
+int(1)

Zend/tests/gh19053.phpt

@@ -0,0 +1,26 @@
+--TEST--
+GH-19053: Incorrect properties_info_table for abstract properties
+--FILE--
+<?php
+
+abstract class GP {
+    public abstract mixed $foo { get; }
+}
+
+class P extends GP {
+    public mixed $foo = 1;
+}
+
+class C extends P {
+    public mixed $foo { get => 2; }
+}
+
+$c = new C;
+var_dump($c);
+
+?>
+--EXPECTF--
+object(C)#%d (0) {
+  ["foo"]=>
+  uninitialized(mixed)
+}

Zend/tests/property_hooks/gh19044-1.phpt

@@ -0,0 +1,26 @@
+--TEST--
+GH-19044: Protected properties must be scoped according to their prototype (common ancestor has a protected setter)
+--FILE--
+<?php
+
+abstract class P {
+    abstract public mixed $foo { get; }
+}
+
+class C1 extends P {
+    public protected(set) mixed $foo { get => 1; set {} }
+}
+
+class GrandC1 extends C1 {
+    public protected(set) mixed $foo { get => 2; set {} }
+}
+
+class C2 extends C1 {
+    static function foo($c) { return $c->foo += 1; }
+}
+
+var_dump(C2::foo(new GrandC1));
+
+?>
+--EXPECT--
+int(3)