Merge branch 'master' into func-composition

Author: TimWolla

.github/CODEOWNERS

@@ -27,6 +27,7 @@
 /ext/gmp @Girgias
 /ext/intl @devnexen
 /ext/json @bukka
+/ext/lexbor @kocsismate @nielsdos
 /ext/libxml @nielsdos
 /ext/mbstring @alexdowad @youkidearitai
 /ext/mysqli @bukka @kamil-tekiela
@@ -51,6 +52,7 @@
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
+/ext/uri @kocsismate
 /ext/xml @nielsdos
 /ext/xmlreader @nielsdos
 /ext/xmlwriter @nielsdos

NEWS

@@ -52,6 +52,8 @@ PHP                                                                        NEWS
   . Fixed bugs GH-17711 and GH-18022 (Infinite recursion on deprecated attribute
     evaluation) and GH-18464 (Recursion protection for deprecation constants not
     released on bailout). (DanielEScherzer and ilutov)
+  . Fixed AST printing for immediately invoked Closure. (Dmitrii Derepko)
+  . Properly handle __debugInfo() returning an array reference. (nielsdos)
 
 - Curl:
   . Added curl_multi_get_handles(). (timwolla)
@@ -70,6 +72,7 @@ PHP                                                                        NEWS
 - Enchant:
   . Added enchant_dict_remove_from_session(). (nielsdos)
   . Added enchant_dict_remove(). (nielsdos)
+  . Fix missing empty string checks. (nielsdos)
 
 - EXIF:
   . Add OffsetTime* Exif tags. (acc987)
@@ -119,6 +122,8 @@ PHP                                                                        NEWS
   . Fixed ZTS OPcache build on Cygwin. (cmb)
   . Added opcache.file_cache_read_only. (Samuel Melrose)
   . Updated default value of opcache.jit_hot_loop. (Arnaud)
+  . Log a warning when opcache lock file permissions could not be changed.
+    (Taavi Eomäe)
 
 - Output:
   . Fixed calculation of aligned buffer size. (cmb)
@@ -137,6 +142,10 @@ PHP                                                                        NEWS
 - PDO_SQLITE:
   . throw on null bytes / resolve GH-13952 (divinity76).
   . Implement GH-17321: Add setAuthorizer to Pdo\Sqlite. (nielsdos)
+  . PDO::sqliteCreateCollation now throws a TypeError if the callback
+    has a wrong return type. (David Carlier)
+  . Added Pdo_Sqlite::ATTR_BUSY_STATEMENT constant to check
+    if a statement is currently executing. (David Carlier)
 
 - PGSQL:
   . Added pg_close_stmt to close a prepared statement while allowing
@@ -183,6 +192,11 @@ PHP                                                                        NEWS
 - SOAP:
   . Fixed bug #49169 (SoapServer calls wrong function, although "SOAP action"
     header is correct). (nielsdos)
+  . Fix namespace handling of WSDL and XML schema in SOAP,
+    fixing at least GH-16320 and bug #68576. (nielsdos)
+  . Fixed bug #70951 (Segmentation fault on invalid WSDL cache). (nielsdos)
+  . Implement request #55503 (Extend __getTypes to support enumerations).
+    (nielsdos, datibbaw)
 
 - Sockets:
   . Added IPPROTO_ICMP/IPPROTO_ICMPV6 to create raw socket for ICMP usage.
@@ -235,6 +249,10 @@ PHP                                                                        NEWS
 - Tests:
   . Allow to shuffle tests even in non-parallell mode. (dhuang00)
 
+- Tidy:
+  . tidy::__construct/parseFile/parseString methods throw an exception if
+    the configuration argument is invalid. (David Carlier)
+
 - Windows:
   . Fixed bug GH-10992 (Improper long path support for relative paths). (cmb,
     nielsdos)

UPGRADING

@@ -42,8 +42,8 @@ PHP 8.5 UPGRADE NOTES
     have run and the output handlers have been cleaned up.
     This is a consequence of fixing GH-18033.
   . Traits are now bound before the parent class. This is a subtle behavioral
-    change, but should closer match user expectations, demonstrated by GH-15753
-    and GH-16198.
+    change, but should more closely match user expectations, demonstrated by
+    GH-15753 and GH-16198.
 
 - FileInfo:
   . finfo_file() and finfo::file() now throws a ValueError instead of a
@@ -91,7 +91,7 @@ PHP 8.5 UPGRADE NOTES
     argument when fetching into an object, will now throw an Error.
   . The value of the constants PDO::FETCH_GROUP, PDO::FETCH_UNIQUE,
     PDO::FETCH_CLASSTYPE, PDO::FETCH_PROPS_LATE, and PDO::FETCH_SERIALIZE
-    has changed.
+    have changed.
   . A ValueError is now thrown if PDO::FETCH_PROPS_LATE is used with a fetch
     mode different than PDO::FETCH_CLASS, consistent with other fetch flags.
   . A ValueError is now thrown if PDO::FETCH_INTO is used as a fetch mode in
@@ -158,7 +158,7 @@ PHP 8.5 UPGRADE NOTES
     CURLINFO_USED_PROXY gets zero set if no proxy was used in the
     previous transfer or a non-zero value if a proxy was used.
     CURLINFO_HTTPAUTH_USED and CURLINFO_PROXYAUTH_USED get bitmasks
-    indicating the http and proxy authentication methods that were
+    indicating the HTTP and proxy authentication methods that were
     used in the previous request. See CURLAUTH_* constants for
     possible values.
   . Added CURLOPT_INFILESIZE_LARGE Curl option, which is a safe
@@ -168,10 +168,10 @@ PHP 8.5 UPGRADE NOTES
     accepts the largest integer value the system can handle.
   . Added CURLFOLLOW_OBEYCODE, CURLFOLLOW_FIRSTONLY and CURLFOLLOW_ALL values for
     CURLOPT_FOLLOWLOCATION curl_easy_setopt option.
-    CURLFOLLOW_OBEYCODE to follow more strictly in regard of redirect
+    CURLFOLLOW_OBEYCODE to follow more strictly in regard to redirect
     if they are allowed. CURLFOLLOW_FIRSTONLY to follow only the
-    first redirect thus if there any follow up redirect, it won't go
-    any further. CURLFOLLOW_ALL is equivalent to set CURLOPT_FOLLOWLOCATION
+    first redirect thus if there is any follow up redirect, it won't go
+    any further. CURLFOLLOW_ALL is equivalent to setting CURLOPT_FOLLOWLOCATION
     to true.
 
 - DOM:
@@ -187,13 +187,19 @@ PHP 8.5 UPGRADE NOTES
     number formats.
   . Added Locale::addLikelySubtags and Locale::minimizeSubtags to
     handle likely tags on a given locale.
-  . Added IntlListFormatter class to format, order, punctuates
+  . Added IntlListFormatter class to format, order, and punctuate
     a list of items with a given locale, IntlListFormatter::TYPE_AND,
     IntlListFormatter::TYPE_OR, IntlListFormatter::TYPE_UNITS operands and
     IntlListFormatter::WIDTH_WIDE, IntlListFormatter::WIDTH_SHORT and
     IntlListFormatter::WIDTH_NARROW widths.
     It is supported from icu 67.
 
+- PDO_Sqlite:
+  . Added class constant Pdo_Sqlite::ATTR_BUSY_STATEMENT.
+
+- SOAP:
+  . Enumeration cases are now dumped in __getTypes().
+
 - XSL:
   . The $namespace argument of XSLTProcessor::getParameter(),
     XSLTProcessor::setParameter() and XSLTProcessor::removeParameter()
@@ -247,7 +253,7 @@ PHP 8.5 UPGRADE NOTES
     was actually never possible.
 
 - LDAP:
-  . ldap_get_option() now accept a NULL connection, as ldap_set_option(),
+  . ldap_get_option() now accepts a NULL connection, as ldap_set_option(),
     to allow retrieval of global options.
 
 - libxml:
@@ -260,11 +266,14 @@ PHP 8.5 UPGRADE NOTES
   . PDO::pgsqlCopyFromArray also supports inputs as Iterable.
   . Pdo\Pgsql::setAttribute and Pdo\Pgsql::prepare supports
     PDO::ATTR_PREFETCH sets to 0 which set to lazy fetch mode.
-    In this mode, statements cannot be run parallely.
+    In this mode, statements cannot be run in parallel.
 
 - PDO_SQLITE:
   . SQLite PDO::quote() will now throw an exception or emit a warning,
     depending on the error mode, if the string contains a null byte.
+  . PDO::sqliteCreateCollation will now throw an exception
+    if the callback has the wrong return type, making it more
+    in line with Pdo_Sqlite::createCollation behavior.
 
 - PGSQL:
   . pg_copy_from also supports inputs as Iterable.
@@ -287,7 +296,7 @@ PHP 8.5 UPGRADE NOTES
     are enum cases rather than normal class constants.
 
 - Session:
-  . session_start is stricter in regard of the option argument.
+  . session_start is stricter in regard to the option argument.
     It throws a ValueError if the whole is not a hashmap or
     a TypeError if read_on_close value is not a valid type
     compatible with int.
@@ -304,7 +313,7 @@ PHP 8.5 UPGRADE NOTES
     ValueError if the port is lower than 0 or greater than 65535,
     also if any of the hints array entry is indexes numerically.
   . socket_addrinfo_lookup throws a TypeError if any of the hints
-    values cannot be cast to a int and can throw a ValueError if
+    values cannot be cast to int and can throw a ValueError if
     any of these values overflow.
   . socket_set_option with MCAST_LEAVE_GROUP/MCAST_LEAVE_SOURCE_GROUP
     options will throw an exception if the value isn't a valid object
@@ -313,6 +322,12 @@ PHP 8.5 UPGRADE NOTES
   . socket_getsockname gets the interface index and its string
     representation with AF_PACKET socket.
 
+- Tidy:
+  . tidy::__construct/parseFile/parseString now throws a ValueError
+    if the configuration contains an invalid or set a read-only
+    internal entry, a TypeError contains, at least, one element
+    when the key is not a string.
+
 - Zlib:
   . The "use_include_path" argument for the
     gzfile, gzopen and readgzfile functions had been changed
@@ -412,6 +427,9 @@ PHP 8.5 UPGRADE NOTES
 - PCRE:
   . Upgraded to pcre2lib from 10.44 to 10.45.
 
+- PDO_Sqlite:
+  . Increased minimum release version support from 3.7.7 to 3.7.17.
+
 - Readline:
   . The return types of readline_add_history(), readline_clear_history(), and
     readline_callback_handler_install() have been changed to true, rather
@@ -456,6 +474,9 @@ PHP 8.5 UPGRADE NOTES
   - SHUT_WR.
   - SHUT_RDWR.
 
+- Tokenizer:
+  . T_VOID_CAST.
+
 ========================================
 11. Changes to INI File Handling
 ========================================
@@ -543,7 +564,7 @@ PHP 8.5 UPGRADE NOTES
   . Now avoids creating extra string copies when converting strings
     for use in the collator.
 
-MBString:
+- MBString:
   . The parts of the code that used SSE2 have been adapted to use SIMD
     with ARM NEON as well.
 

UPGRADING.INTERNALS

@@ -46,6 +46,10 @@ PHP 8.5 INTERNALS UPGRADE NOTES
     without duplicate build rules.  It is up to the SAPI maintainers to ensure
     that appropriate build rules are created.
 
+- Linux build system changes
+  . libdir is properly set when --libdir (ex: /usr/lib64) and --with-libdir (ex lib64)
+    configure options are used to ${libdir}/php (ex: /usr/lib64/php)
+
 ========================
 3. Module changes
 ========================
@@ -62,6 +66,7 @@ PHP 8.5 INTERNALS UPGRADE NOTES
 
 - ext/libxml
   . The refcount APIs now return an `unsigned int` instead of an `int`.
+  . Removed php_libxml_xmlCheckUTF8(). Use xmlCheckUTF8() from libxml instead.
 
 - ext/pdo
   . Added `php_pdo_stmt_valid_db_obj_handle()` to check if the database object

Zend/tests/__debugInfo_reference.phpt

@@ -0,0 +1,22 @@
+--TEST--
+__debugInfo with reference return
+--FILE--
+<?php
+
+class Test {
+    private $tmp = ['x' => 1];
+
+    public function &__debugInfo(): array
+    {
+        return $this->tmp;
+    }
+}
+
+var_dump(new Test);
+
+?>
+--EXPECT--
+object(Test)#1 (1) {
+  ["x"]=>
+  int(1)
+}

Zend/tests/arrow_functions/007.phpt

@@ -5,8 +5,6 @@ zend.assertions=1
 --FILE--
 <?php
 
-// TODO We're missing parentheses for the direct call
-
 try {
     assert((fn() => false)());
 } catch (AssertionError $e) {
@@ -21,5 +19,5 @@ try {
 
 ?>
 --EXPECT--
-assert(): assert(fn() => false()) failed
-assert(): assert(fn&(int ...$args): ?bool => $args[0](false)) failed
+assert(): assert((fn() => false)()) failed
+assert(): assert((fn&(int ...$args): ?bool => $args[0])(false)) failed

Zend/tests/ast/ast_serialize_floats.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Serialization of floats are correct
+--INI--
+zend.assertions=1
+--FILE--
+<?php
+try {
+    assert(!is_float(0.0));
+} catch (AssertionError $e) {
+    echo 'assert(): ', $e->getMessage(), ' failed', PHP_EOL;
+}
+try {
+    assert(!is_float(1.1));
+} catch (AssertionError $e) {
+    echo 'assert(): ', $e->getMessage(), ' failed', PHP_EOL;
+}
+try {
+    assert(!is_float(1234.5678));
+} catch (AssertionError $e) {
+    echo 'assert(): ', $e->getMessage(), ' failed', PHP_EOL;
+}
+?>
+--EXPECT--
+assert(): assert(!is_float(0.0)) failed
+assert(): assert(!is_float(1.1)) failed
+assert(): assert(!is_float(1234.5678)) failed

Zend/tests/e_strict-deprecated.phpt

@@ -10,5 +10,5 @@ var_dump(E_STRICT);
 --EXPECTF--
 int(30719)
 
-Deprecated: Constant E_STRICT is deprecated in %s on line %d
+Deprecated: Constant E_STRICT is deprecated since 8.4, the error level was removed in %s on line %d
 int(2048)

Zend/tests/enum/ast-dumper.phpt

@@ -28,7 +28,7 @@ try {
 
 ?>
 --EXPECT--
-assert(function () {
+assert((function () {
     enum Foo {
         case Bar;
     }
@@ -45,4 +45,4 @@ assert(function () {
     }
 
     return false;
-}())
+})())

Zend/tests/exceptions/exception_027.phpt

@@ -0,0 +1,37 @@
+--TEST--
+Exception properties are overridden by property hooks
+--FILE--
+<?php
+class MyException extends Exception
+{
+    private bool $modified = false;
+
+    protected $code {
+        set($value) {
+            if ($this->modified) {
+                throw new Exception();
+            } else {
+                $this->modified = true;
+
+                $this->code = $value;
+            }
+        }
+    }
+}
+
+$e = new MyException("foo", 1, new Exception());
+
+try {
+    $e->__construct("bar", 2, null);
+} catch (Exception) {
+}
+
+var_dump($e->getMessage());
+var_dump($e->getCode());
+var_dump($e->getPrevious()::class);
+
+?>
+--EXPECTF--
+string(3) "bar"
+int(1)
+string(9) "Exception"