Merge branch 'master' into zendmm-remove-debug-custom-handlers

Author: realFlowControl

.circleci/config.yml

@@ -69,7 +69,6 @@ jobs:
               `#snmp-mibs-downloader` \
               freetds-dev \
               `#unixodbc-dev` \
-              libc-client-dev \
               dovecot-core \
               dovecot-pop3d \
               dovecot-imapd \

.github/actions/apt-x64/action.yml

@@ -59,7 +59,6 @@ runs:
           unixodbc-dev \
           llvm \
           clang \
-          libc-client-dev \
           dovecot-core \
           dovecot-pop3d \
           dovecot-imapd \

NEWS

@@ -33,6 +33,7 @@ PHP                                                                        NEWS
   . Fix DOMElement->prefix with empty string creates bogus prefix. (nielsdos)
   . Handle OOM more consistently. (nielsdos)
   . Implemented "Improve callbacks in ext/dom and ext/xsl" RFC. (nielsdos)
+  . Added DOMXPath::quote() static method. (divinity76)
 
 - Fileinfo:
   . Update to libmagic 5.45. (nielsdos)
@@ -69,6 +70,9 @@ PHP                                                                        NEWS
   . Added LDAP_OPT_X_TLS_PROTOCOL_MAX/LDAP_OPT_X_TLS_PROTOCOL_TLS1_3
     constants. (StephenWall)
 
+- LibXML:
+  . Added LIBXML_RECOVER constant. (nielsdos)
+
 - MBString:
   . Added mb_trim, mb_ltrim and mb_rtrim. (Yuya Hamada)
 
@@ -188,6 +192,8 @@ PHP                                                                        NEWS
   . debug_zval_dump() now indicates whether an array is packed. (Max Semenik)
   . Fix GH-12143 (Optimize round). (SakiTakamachi)
   . Changed return type of long2ip to string from string|false. (Jorg Sowa)
+  . Fix GH-12143 (Extend the maximum precision round can handle by one digit).
+    (SakiTakamachi)
 
 - XML:
   . Added XML_OPTION_PARSE_HUGE parser option. (nielsdos)

UPGRADING

@@ -41,6 +41,9 @@ PHP 8.4 UPGRADE NOTES
     DOMException now. This situation is extremely unlikely though and probably
     will not affect you. As a result DOMImplementation::createDocument() now has
     a tentative return type of DOMDocument instead of DOMDocument|false.
+  . Previously, DOMXPath objects could be cloned, but resulted in an unusable
+    object. This is no longer possible, and cloning a DOMXPath object now throws
+    an error.
 
 - MBString:
   . mb_encode_numericentity() and mb_decode_numericentity() now check that
@@ -226,6 +229,8 @@ PHP 8.4 UPGRADE NOTES
 - Reflection:
   . ReflectionAttribute now contains a $name property to improve the debugging
     experience.
+  . ReflectionClassConstant::__toString() and ReflectionProperty::__toString()
+    now returns the attached doc comments.
 
 - SOAP:
   . Added support for clark notation for namespaces in class map.
@@ -381,6 +386,8 @@ PHP 8.4 UPGRADE NOTES
     certain numbers, so this fix removes "pre-rounding" and changes the way numbers
     are compared, so that the values ​​are correctly rounded as decimal numbers.
   . long2ip() now returns string instead of string|false.
+  . The maximum precision that can be handled by round() has been extended by
+    one digit.
 
 ========================================
 6. New Functions
@@ -390,6 +397,8 @@ PHP 8.4 UPGRADE NOTES
   . Added DOMNode::compareDocumentPosition().
   . Added DOMXPath::registerPhpFunctionNS().
     RFC: https://wiki.php.net/rfc/improve_callbacks_dom_and_xsl
+  . Added DOMXPath::quote() to quote a string for use in an XPath expression.
+    Example usage: "//span[contains(text()," . $xpath->quote($string) . ")]"
 
 - Intl:
   . Added IntlDateFormatter::getIanaID()/intltz_get_iana_id() to
@@ -475,6 +484,9 @@ PHP 8.4 UPGRADE NOTES
   . LDAP_OPT_X_TLS_PROTOCOL_MAX.
   . LDAP_OPT_X_TLS_PROTOCOL_TLS1_3.
 
+- LibXML:
+  . LIBXML_RECOVER.
+
 - OpenSSL:
   . X509_PURPOSE_OCSP_HELPER.
   . X509_PURPOSE_TIMESTAMP_SIGN.

UPGRADING.INTERNALS

@@ -37,6 +37,9 @@ PHP 8.4 INTERNALS UPGRADE NOTES
 * The zend_*printf family of functions now supports the "%S" modifier to print
   out zend_string*. This won't cut off the string if it embeds a NUL byte.
 
+* The inet_aton() and win32/inet.h on Windows have been removed. Use Windows
+  native inet_pton() from ws2tcpip.h.
+
 * zend_mm_set_custom_debug_handlers() has been removed from ZendMM, use
   zend_mm_set_custom_handlers() instead which now supports DEBUG builds
 
@@ -74,7 +77,6 @@ PHP 8.4 INTERNALS UPGRADE NOTES
   void(*)(void *, size_t) to
   void(*)(void *, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 
-
 ========================
 2. Build system changes
 ========================
@@ -104,6 +106,10 @@ PHP 8.4 INTERNALS UPGRADE NOTES
    - Symbol DARWIN has been removed (use __APPLE__ to target Darwin systems).
    - Symbol MISSING_FCLOSE_DECL and M4 macro PHP_MISSING_FCLOSE_DECL removed.
    - Symbol HAVE_BSD_ICONV has been removed.
+   - Symbol ZEND_FIBER_ASM has been removed.
+   - Symbols HAVE_DLOPEN and HAVE_DLSYM have been removed.
+   - Symbol HAVE_LIBM has been removed.
+   - Symbol HAVE_INET_ATON has been removed.
    - M4 macro PHP_DEFINE (atomic includes) removed (use AC_DEFINE and config.h).
    - M4 macro PHP_WITH_SHARED has been removed (use PHP_ARG_WITH).
    - M4 macro PHP_STRUCT_FLOCK has been removed (use AC_CHECK_TYPES).
@@ -140,6 +146,13 @@ PHP 8.4 INTERNALS UPGRADE NOTES
      the new php_random_result struct, replacing the last_generated_size
      member of the php_random_status struct and the generate_size member of
      the php_random_algo struct.
+   - The php_random_status struct has been removed, since the previous change
+     reduced it to a single void* member containing the actual state, resulting
+     in needless indirection. Functions taking a php_random_algo struct pointer
+     and a php_random_status struct pointer as separate parameters now take a
+     single php_random_algo_with_state struct by value, making it easier to
+     pass around the state with its associated algorithm and thus reducing
+     the chance for mistakes.
    - The CSPRNG API (php_random_(bytes|int)_*) is now provided by the new
      and much smaller php_random_csprng.h header. The new header is included
      in php_random.h for compatibility with existing users.

Zend/Zend.m4

@@ -151,7 +151,7 @@ AC_CHECK_FUNCS(getpid kill pthread_getattr_np pthread_attr_get_np pthread_get_st
 dnl Check for sigsetjmp. If it's defined as a macro, AC_CHECK_FUNCS won't work.
 AC_CHECK_FUNCS([sigsetjmp],,
   [AC_CHECK_DECL([sigsetjmp],
-    [AC_DEFINE([HAVE_SIGSETJMP],[1],[Define to 1 if you have the 'sigsetjmp' function.])],,
+    [AC_DEFINE([HAVE_SIGSETJMP], [1])],,
     [#include <setjmp.h>])])
 
 dnl Test whether the stack grows downwards

Zend/tests/offsets/ArrayAccess_container_offset_behaviour.phpt

@@ -40,26 +40,37 @@ VAR_DUMP_OF_OFFSET
 string(12) "CLASS_NAME::offsetGet"
 VAR_DUMP_OF_OFFSET
 int(5)
+Reference to dimension:
+string(12) "CLASS_NAME::offsetGet"
+VAR_DUMP_OF_OFFSET
+
+Notice: Indirect modification of overloaded element of CLASS_NAME has no effect in %s on line 55
+Value of reference:
+int(5)
+Value of container dimension after write to reference (should be int(100) if successful):
+string(12) "CLASS_NAME::offsetGet"
+VAR_DUMP_OF_OFFSET
+int(5)
 unset():
 string(14) "CLASS_NAME::offsetUnset"
 VAR_DUMP_OF_OFFSET
 Nested read:
 string(12) "CLASS_NAME::offsetGet"
 VAR_DUMP_OF_OFFSET
 
-Warning: Trying to access array offset on int in %s on line 62
+Warning: Trying to access array offset on int in %s on line 74
 NULL
 Nested write:
 string(12) "CLASS_NAME::offsetGet"
 VAR_DUMP_OF_OFFSET
 
-Notice: Indirect modification of overloaded element of CLASS_NAME has no effect in %s on line 69
+Notice: Indirect modification of overloaded element of CLASS_NAME has no effect in %s on line 81
 Cannot use a scalar value as an array
 Nested Read-Write:
 string(12) "CLASS_NAME::offsetGet"
 VAR_DUMP_OF_OFFSET
 
-Notice: Indirect modification of overloaded element of CLASS_NAME has no effect in %s on line 76
+Notice: Indirect modification of overloaded element of CLASS_NAME has no effect in %s on line 88
 Cannot use a scalar value as an array
 Nested isset():
 string(15) "CLASS_NAME::offsetExists"
@@ -83,7 +94,7 @@ Nested unset():
 string(12) "CLASS_NAME::offsetGet"
 VAR_DUMP_OF_OFFSET
 
-Notice: Indirect modification of overloaded element of CLASS_NAME has no effect in %s on line 102
+Notice: Indirect modification of overloaded element of CLASS_NAME has no effect in %s on line 114
 Cannot unset offset in a non-array variable
 
 OUTPUT;
@@ -112,6 +123,37 @@ foreach (['A', 'B'] as $class) {
             EXPECTED_OUTPUT
         );
 
+        if ($varOutput !== $expected_output) {
+            file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_ArrayAccess_container_{$failuresNb}.txt", $varOutput);
+            ++$failuresNb;
+            $failures[] = $error;
+        }
+        ++$testCasesTotal;
+    }
+    /* Using offsets as references */
+    foreach ($offsets as $offset) {
+        $dimension = &$offset;
+        $container = new $class();
+        $error = "(new $class())[&" . zend_test_var_export($dimension) . '] has different outputs' . "\n";
+        ob_start();
+        var_dump($dimension);
+        $var_dump_output = ob_get_clean();
+
+        include $var_dim_filename;
+        $varOutput = ob_get_contents();
+        ob_clean();
+        $varOutput = str_replace(
+            [$var_dim_filename],
+            ['%s'],
+            $varOutput
+        );
+
+        $expected_output = str_replace(
+            ["VAR_DUMP_OF_OFFSET\n", "CLASS_NAME"],
+            [$var_dump_output, $class],
+            EXPECTED_OUTPUT
+        );
+
         if ($varOutput !== $expected_output) {
             file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_ArrayAccess_container_{$failuresNb}.txt", $varOutput);
             ++$failuresNb;