Merge remote-tracking branch 'php/master' into embed-req-cli

Author: henderkes

.github/matrix.php

@@ -127,19 +127,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
         $test_arm = version_compare($php_version, '8.4', '>=');
         $jobs['MACOS']['matrix'] = $all_variations
             ? ['arch' => $test_arm ? ['X64', 'ARM64'] : ['X64'], 'debug' => [true, false], 'zts' => [true, false]]
-            : ['include' => [['arch' => $test_arm ? 'ARM64' : 'X64', 'debug' => true, 'zts' => false, 'jit' => true]]];
-        if ($all_variations) {
-            // Set the jit variable on X64 jobs
-            $jobs['MACOS']['matrix']['include'][] = ['arch' => 'X64', 'jit' => true];
-            if ($test_arm) {
-                // Set the jit variable on ARM64 NTS jobs
-                $jobs['MACOS']['matrix']['include'][] = ['arch' => 'ARM64', 'zts' => false, 'jit' => true];
-                // Set the jit variable on ARM64 ZTS jobs on 8.6+
-                if (version_compare($php_version, '8.6', '>=')) {
-                    $jobs['MACOS']['matrix']['include'][] = ['arch' => 'ARM64', 'zts' => true, 'jit' => true];
-                }
-            }
-        }
+            : ['include' => [['arch' => $test_arm ? 'ARM64' : 'X64', 'debug' => true, 'zts' => false]]];
         $jobs['MACOS']['config']['arm64_version'] = version_compare($php_version, '8.4', '>=') ? '15' : '14';
     }
     if ($all_jobs || $test_msan) {

.github/workflows/test-suite.yml

@@ -345,18 +345,18 @@ jobs:
         if: ${{ inputs.all_variations }}
         uses: ./.github/actions/test-macos
       - name: Test Tracing JIT
-        if: ${{ matrix.jit }}
+        if: ${{ matrix.arch == 'X64' || !matrix.zts }}
         uses: ./.github/actions/test-macos
         with:
           enableOpcache: true
           jitType: tracing
       - name: Test OpCache
-        if: ${{ inputs.all_variations }}
+        if: ${{ inputs.all_variations || (matrix.arch == 'ARM64' && matrix.zts) }}
         uses: ./.github/actions/test-macos
         with:
           enableOpcache: true
       - name: Test Function JIT
-        if: ${{ inputs.all_variations && matrix.jit }}
+        if: ${{ inputs.all_variations && (matrix.arch == 'X64' || !matrix.zts) }}
         uses: ./.github/actions/test-macos
         with:
           enableOpcache: true
@@ -573,6 +573,10 @@ jobs:
           php -r '$c = file_get_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php"); $c = str_replace("public function testSanitizeDeepNestedString()", "#[\\PHPUnit\\Framework\\Attributes\\Group('"'"'skip'"'"')]\n    public function testSanitizeDeepNestedString()", $c); file_put_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php", $c);'
           # Buggy FFI test in Symfony, see https://github.com/symfony/symfony/issues/47668
           php -r '$c = file_get_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php"); $c = str_replace("public function testCastNonTrailingCharPointer()", "#[\\PHPUnit\\Framework\\Attributes\\Group('"'"'skip'"'"')]\n    public function testCastNonTrailingCharPointer()", $c); file_put_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php", $c);'
+          # Causes massive amounts of system calls with USE_ZEND_ALLOC=0, exceeding the timeout
+          if [ -e 'src/Symfony/Component/Console/Tests/Helper/FileInputHelperTest.php' ]; then
+            php -r '$c = file_get_contents("src/Symfony/Component/Console/Tests/Helper/FileInputHelperTest.php"); $c = str_replace("public function testReadWithPasteDetectionAbortsBeyondMaxBytes()", "#[\\PHPUnit\\Framework\\Attributes\\Group('"'"'skip'"'"')]\n    public function testReadWithPasteDetectionAbortsBeyondMaxBytes()", $c); file_put_contents("src/Symfony/Component/Console/Tests/Helper/FileInputHelperTest.php", $c);'
+          fi
           export SYMFONY_DEPRECATIONS_HELPER=max[total]=999
           X=0
           for component in $(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n'); do

NEWS

@@ -6,6 +6,11 @@ PHP                                                                        NEWS
   . Implemented partial function application RFC. (Arnaud)
   . Fixed bug GH-22263 (reset typed property default on every unserialize
     failure path). (David Carlier)
+  . Fixed bug GH-18985 (Wrong line numbers for match with constant arms).
+    (ilutov)
+  . Fixed bug GH-18847 (SEGV in zend_fetch_debug_backtrace() when the memory
+    limit is reached while the tracing JIT enters a call frame). (Arnaud,
+    iliaal)
 
 - DOM:
   . Fixed bug GH-22825 (DOMElement::setAttribute() fails silently when the DTD
@@ -22,6 +27,7 @@ PHP                                                                        NEWS
 - Intl:
   . Fixed grammatical issues in Normalizer invalid form and IntlCalendar time
     zone offset error messages. (Weilin Du)
+  . Removed the dependency on the ICU IO library. (Weilin Du)
 
 - ODBC:
   . Fixed bug GH-22668 (Heap buffer over-read when a column value exceeds the
@@ -38,6 +44,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-22665 (Out-of-bounds write when the ODBC driver reports a
     diagnostic message length beyond the error buffer). (iliaal)
 
+- Phar:
+  . Fixed grammatical issues and outdated terminology in Phar error messages.
+    (Weilin Du)
+
 - Reflection:
   . Fixed bug GH-22681 (Reflection*::__toString() truncates on null bytes).
     (DanielEScherzer)
@@ -59,6 +69,10 @@ PHP                                                                        NEWS
   . Added a new IO copy API used by php_stream_copy_to_stream_ex() that
     leverages platform primitives (sendfile, splice, copy_file_range,
     TransmitFile) for faster stream copying. (Jakub Zelenka, David Carlier)
+  . Fixed bug GH-22841 (php_stream_copy_to_stream_ex() drops progress
+    notifications when using the copy fast path). (David Carlier)
+  . Fixed bug GH-15836 (Use-after-free when a user stream filter accesses
+    $this->stream during the close flush). (iliaal)
 
 16 Jul 2026, PHP 8.6.0alpha2
 
@@ -212,7 +226,7 @@ PHP                                                                        NEWS
   . Fix OSS-Fuzz #429429090 (Failed assertion on unset() with uninitialized
     container). (ilutov)
   . Fixed GH-20564 (Don't call autoloaders with pending exception). (ilutov)
-  . Fix deprecation now showing when accessing null key of an array with JIT.
+  . Fix deprecation not showing when accessing null key of an array with JIT.
     (alexandre-daubois)
   . Fixed bug GH-20174 (Assertion failure in
     ReflectionProperty::skipLazyInitialization after failed LazyProxy
@@ -356,6 +370,8 @@ PHP                                                                        NEWS
     and Openssl\Session class. (Jakub Zelenka)
   . Added TLS external PSK support for streams with new context options and
     Openssl\Psk class. (Jakub Zelenka)
+  . Added TLS 1.3 early data (0-RTT) support for streams with new context
+    options early_data, max_early_data and early_data_cb. (Jakub Zelenka)
   . Added stream crypto status for exposing OpenSSL WANT_READ / WANT_WRITE.
     (Jakub Zelenka)
 

UPGRADING

@@ -297,8 +297,13 @@ PHP 8.6 UPGRADE NOTES
     requests, implementing custom server-side session storage, and controlling
     session cache behavior.
     RFC: https://wiki.php.net/rfc/tls_session_resumption
-  . Added TLS external PSK support for streams with new strem context options:
+  . Added TLS external PSK support for streams with new stream context options:
     psk_client_cb and psk_server_cb. This allows setting and receiving PSK.
+  . Added TLS 1.3 early data (0-RTT) support for streams. Clients send early
+    data with the early_data context option; servers accept it with
+    max_early_data and receive it through the early_data_cb callback. The
+    outcome is reported as 'accepted', 'rejected' or 'not_sent' in the
+    early_data key of the crypto stream_get_meta_data() array.
 
 - Phar:
   . Overriding the getMTime() and getPathname() methods of SplFileInfo now

UPGRADING.INTERNALS

@@ -83,6 +83,43 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . The php_error_docref1() and php_error_docref2() functions have been
     removed, instead rely on the error_include_args INI option to show the
     arguments to functions in a consistent manner.
+  . The following PHP stream functions prefixed with _ have been removed,
+    and the macro without it has become the canonical function name:
+    * _php_stream_cast()
+    * _php_stream_free_enclosed()
+    * _php_stream_free()
+    * _php_stream_seek()
+    * _php_stream_tell()
+    * _php_stream_read()
+    * _php_stream_write()
+    * _php_stream_fill_read_buffer()
+    * _php_stream_printf()
+    * _php_stream_eof()
+    * _php_stream_getc()
+    * _php_stream_putc()
+    * _php_stream_flush()
+    * _php_stream_sync()
+    * _php_stream_get_line()
+    * _php_stream_puts()
+    * _php_stream_stat()
+    * _php_stream_mkdir()
+    * _php_stream_rmdir()
+    * _php_stream_readdir()
+    * _php_stream_set_option()
+    * _php_stream_get_url_stream_wrappers_hash()
+    * _php_get_stream_filters_hash()
+    * _php_stream_mmap_unmap()
+    * _php_stream_mmap_unmap_ex()
+    * _php_stream_filter_prepend()
+    * _php_stream_filter_append()
+    * _php_stream_filter_flush()
+  . The PHP stream function _php_stream_stat_path() has been renamed to
+    php_stream_stat_path_ex()
+  . The PHP stream function _php_stream_scandir() was removed,
+    insted the PHP macro php_stream_scandir() is now a function as the
+    flags parameter was never used.
+  . The PHP stream function _php_stream_flush() was removed,
+    instead the PHP macro php_stream_flush() is now a proper function.
 
 - Changed:
   . Internal functions that return by reference are now expected to
@@ -114,6 +151,7 @@ PHP 8.6 INTERNALS UPGRADE NOTES
     longer is a pointer, but a directly embedded HashTable struct.
   . Extended php_stream_filter_ops with seek method.
   . zend_argument_error_variadic() now takes a new 'function' parameter.
+  . The param argument in the php_verror() function has been removed.
 
 - Added:
   . New zend_class_entry.ce_flags2 and zend_function.fn_flags2 fields were

Zend/Optimizer/zend_optimizer.c

@@ -1052,7 +1052,10 @@ static void zend_optimize(zend_op_array      *op_array,
 	}
 
 	if (ctx->debug_level & ZEND_DUMP_BEFORE_OPTIMIZER) {
-		zend_dump_op_array(op_array, ZEND_DUMP_LIVE_RANGES, "before optimizer", NULL);
+		uint32_t additional_dump_flags = (ctx->debug_level & ZEND_DUMP_LINE_NUMBERS_PASSTHRU)
+			? ZEND_DUMP_LINE_NUMBERS
+			: 0;
+		zend_dump_op_array(op_array, ZEND_DUMP_LIVE_RANGES|additional_dump_flags, "before optimizer", NULL);
 	}
 
 	/* pass 1 (Simple local optimizations)

Zend/Optimizer/zend_optimizer.h

@@ -80,6 +80,7 @@
 #define ZEND_DUMP_DFA_SSA           (1<<27)
 #define ZEND_DUMP_DFA_SSA_VARS      (1<<28)
 #define ZEND_DUMP_SCCP              (1<<29)
+#define ZEND_DUMP_LINE_NUMBERS_PASSTHRU (1<<30)
 
 typedef struct _zend_script {
 	zend_string   *filename;

Zend/tests/first_class_callable/constexpr/gh22782.phpt

@@ -7,6 +7,7 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/gh22782.inc
+opcache.file_cache_only=0
 --SKIPIF--
 <?php
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');

Zend/tests/oss-fuzz-539121135.phpt

@@ -0,0 +1,12 @@
+--TEST--
+OSS-Fuzz-539121135: Use-of-uninitialized-value ast->lineno
+--FILE--
+<?php
+
+namespace {}
+
+''
+
+?>
+--EXPECTF--
+Fatal error: No code may exist outside of namespace {} in %s on line %d

Zend/tests/partial_application/preloading.phpt

@@ -4,6 +4,7 @@ PFA preloading
 opcache.enable=1
 opcache.enable_cli=1
 opcache.preload={PWD}/preloading.inc
+opcache.file_cache_only=0
 --SKIPIF--
 <?php
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');