[pull] master from php:master

.github/matrix.php

@@ -187,6 +187,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
 foreach ($branches as &$branch) {
     $php_version = $branch['version'][0] . '.' . $branch['version'][1];
     $branch['jobs'] = select_jobs($repository, $trigger, $nightly, $labels, $php_version, $branch['ref'], $all_variations);
+    $branch['config']['default_run_test_jobs'] = version_compare($php_version, '8.6', '>=') ? '' : '-j2';
     $branch['config']['ubuntu_version'] = version_compare($php_version, '8.5', '>=') ? '24.04' : '22.04';
 }
 

.github/workflows/test-suite.yml

@@ -857,7 +857,7 @@ jobs:
       PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
       THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
       INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
-      PARALLEL: -j2
+      PARALLEL: ${{ matrix.asan && '-j2' || fromJson(inputs.branch).config.default_run_test_jobs }}
       OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
       ASAN: "${{ matrix.asan && '1' || '0' }}"
       CLANG_TOOLSET: "${{ matrix.clang && '1' || '0' }}"

NEWS

@@ -7,6 +7,7 @@ PHP                                                                        NEWS
     operation depth. (iliaal)
 
 - Core:
+  . Deprecated "namespace" as a class constant name. (NickSdot)
   . Changed run-tests.php to run in parallel by default, using up to 10
     automatically detected workers. Pass -j1 for sequential execution.
     (NickSdot)
@@ -56,6 +57,8 @@ PHP                                                                        NEWS
   . Added SpoofChecker::areBidiConfusable(). (David Carlier)
   . Added SpoofChecker::getBidiSkeleton(). (Weilin Du)
   . Added SpoofChecker::getSkeleton(). (David Carlier)
+  . Fixed IntlNumberRangeFormatter::format() crash when the formatting fails.
+    (David Carlier)
 
 - PDO:
   . Fixed pdo_raise_impl_error() emitting a warning under ERRMODE_SILENT.
@@ -85,11 +88,14 @@ PHP                                                                        NEWS
     element. (iliaal)
   . SimpleXMLElement::__construct() now raises a ValueError when the $data
     argument contains NUL bytes. (iliaal)
+  . Fixed segfault when comparing uninitialized SimpleXMLElement
+    instances. (iliaal)
 
 - Standard:
   . Added the "filter.max_filter_count" stream context option for php://filter
     URLs. Using more than 16 filters without configuring this option is now
     deprecated. (Sjoerd Langkemper)
+  . metaphone() is now deprecated. (Weilin Du)
   . Improved performance of array_intersect(). (mehmetcansahin)
   . Fixed bug GH-23006 (phpcredits() full-page HTML title says phpinfo()).
     (Weilin Du)
@@ -103,6 +109,10 @@ PHP                                                                        NEWS
   . Io\Poll\Context::wait() now takes a Time\Duration object as a timeout.
     (timwolla)
 
+- XSL:
+  . Fixed use-after-free when a DOMDocument subclass __clone() retains the
+    stylesheet copy made by XSLTProcessor::importStylesheet(). (iliaal)
+
 30 Jul 2026, PHP 8.6.0alpha3
 
 - Core:

UPGRADING

@@ -441,12 +441,22 @@ PHP 8.6 UPGRADE NOTES
 ========================================
 
 - Core:
+  . Using "namespace" as a class constant name is deprecated.
   . Specifying a return type of array|null / ?array for __debugInfo() is now
     deprecated. Specify array instead.
   . Returning values from __construct() and __destruct() is now deprecated.
     RFC: https://wiki.php.net/rfc/deprecate-return-value-from-construct
   . Making __construct() and __destruct() a Generator is now deprecated.
     RFC: https://wiki.php.net/rfc/deprecate-return-value-from-construct
+  . Naming a function readonly is now deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_the_possibility_to_name_a_function_readonly
+  . Passing a 3rd argument to define() is now deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_define_with_case_insensitive_being_specified
+
+- BZ2
+  . Passing an object for the Bzip2 {de}compression stream filter is now
+    deprecated. Use get_object_vars() on the object instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#passing_objects_as_parameters_to_the_bzip2decompress_and_bzip2compress_stream_filters
 
 - GMP
   . The shift (<<, >>) and exponentiation (**) operators on GMP objects now
@@ -457,12 +467,65 @@ PHP 8.6 UPGRADE NOTES
   . Mbregex has been deprecated, because the underlying Oniguruma library
     is no longer maintained.
     RFC: https://wiki.php.net/rfc/eol-oniguruma
+  . Passing objects to mb_convert_variables() is now deprecated
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#passing_objects_for_vars_parameter_of_mb_convert_variables
+
+- SPL:
+  . The spl_classes() function is now deprecated, use
+    ReflectionExtension::getClassNames() instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_spl_classes
+  . The spl_object_hash() function is now deprecated, use spl_object_id()
+    instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_spl_object_hash
+  . The following ArrayIterator methods are now deprecated:
+    * ArrayIterator::getFlags()
+    * ArrayIterator::setFlags()
+    * ArrayIterator::asort()
+    * ArrayIterator::ksort()
+    * ArrayIterator::uasort()
+    * ArrayIterator::uksort()
+    * ArrayIterator::natsort()
+    * ArrayIterator::natcasesort()
+    * ArrayIterator::unserialize()
+    * ArrayIterator::serialize()
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_arrayiterator_methods_that_inherit_arrayobject_implementation
 
 - Standard:
+  . metaphone() is deprecated.
+    Please use a userland phonetic matching library instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_metaphone_function
   . Using more than 16 filters in a php://filter URL without configuring the
     "filter.max_filter_count" stream context option now emits an E_DEPRECATED
     warning. Use stream_filter_append() or configure this option explicitly.
     RFC: https://wiki.php.net/rfc/limit-maximum-number-of-filter-chains
+  . Passing an object to array_walk{_recursive} is now deprecated. Use
+    get_object_vars() on the object instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#passing_objects_for_array_parameter_of_array_walk_and_array_walk_recursive
+  . The is_double() function is now deprecated, use is_float() instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_is_double
+  . The is_long() and is_integer() functions are now deprecated, use is_int()
+    instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_is_integer
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_is_long
+  . The doubleval() function is now deprecated, use floatval() instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_doubleval
+  . The strcoll() function is now deprecated, use Collator::compare() instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_strcoll
+  . The SORT_LOCALE_STRING constant for the family of sort functions is now
+    deprecated, use one of the following functions instead:
+    * Collator::sort()
+    * Collator::asort()
+    * Collator::sort()
+    * Collator::sortWithSortKeys()
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#deprecate_sort_locale_string_flag_for_sort_functions
+
+- Zlib
+  . Passing an object for the zlib deflate and inflate stream filter is now
+    deprecated. Use get_object_vars() on the object instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#passing_objects_as_parameters_to_the_zlibinflate_and_zlibdeflate_stream_filters
+  . Passing an object to the $option argument to deflate_init and inflate_init
+    is now deprecated. Use get_object_vars() on the object instead.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_6#passing_objects_for_options_parameter_of_deflate_init_and_inflate_init
 
 ========================================
 5. Changed Functions

UPGRADING.INTERNALS

@@ -134,6 +134,8 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . The PHP stream function _php_stream_flush() was removed,
     instead the PHP macro php_stream_flush() is now a proper function.
   . The zend_save_error_handling() function was removed.
+  . The zend_parse_parameter() function has been removed, use one fo the
+    zend_parse_arg_TYPE() APIs instead.
 
 - Changed:
   . Internal functions that return by reference are now expected to

Zend/tests/bug60598.phpt

@@ -11,11 +11,11 @@ class ObjectOne {
     public function __construct() {
         global $containers;
         $this->guid = 1;
-        $containers[spl_object_hash($this)] = $this;
+        $containers[spl_object_id($this)] = $this;
     }
     public function __destruct() {
         global $containers;
-        $containers[spl_object_hash($this)] = NULL;
+        $containers[spl_object_id($this)] = NULL;
     }
 }
 

Zend/tests/bug60771.phpt

@@ -2,9 +2,9 @@
 test of larger than 8kb text file being parsed by require statement
 --FILE--
 <?php
- file_put_contents('test.php',str_repeat('passed, ',1024));
- require('./test.php');
- unlink('test.php');
+ file_put_contents(__DIR__ . '/gh60771-test.php',str_repeat('passed, ',1024));
+ require(__DIR__ . '/gh60771-test.php');
+ unlink(__DIR__ . '/gh60771-test.php');
 ?>
 --EXPECT--
 passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 

Zend/tests/builtin_functions/define_arg_3.phpt

@@ -0,0 +1,25 @@
+--TEST--
+define() with 3rd argument
+--FILE--
+<?php
+
+define('my_Constant', 5, true);
+
+try {
+	var_dump(MY_CONSTANT);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+define('MY_CONSTANT', 5, false);
+var_dump(MY_CONSTANT);
+
+?>
+--EXPECTF--
+Deprecated: define(): Argument #3 ($case_insensitive) is ignored and treated as false since declaration of case-insensitive constants is no longer supported, passing the argument explicitly is unnecessary in %s on line %d
+
+Warning: define(): Argument #3 ($case_insensitive) is ignored since declaration of case-insensitive constants is no longer supported, this will be an error in PHP 9.0 in %s on line %d
+Error: Undefined constant "MY_CONSTANT"
+
+Deprecated: define(): Argument #3 ($case_insensitive) is ignored and treated as false since declaration of case-insensitive constants is no longer supported, passing the argument explicitly is unnecessary in %s on line %d
+int(5)

Zend/tests/deprecate_namespace_class_constant.phpt

@@ -0,0 +1,67 @@
+--TEST--
+Using "namespace" as a class constant name is deprecated
+--FILE--
+<?php
+
+define('namespace', 'global constant value');
+
+class Foo {
+    const NAMESPACE = 'class constant value';
+}
+
+interface Bar {
+    const Namespace = 'interface constant value';
+}
+
+enum Baz {
+    const nAmEsPaCe = 'enum constant value';
+}
+
+trait YooTrait {
+    const namespace = 'trait constant value';
+}
+
+class Sup {
+    use YooTrait;
+}
+
+enum Yoo: string {
+    case namespace = 'enum case value';
+}
+
+class Can {
+    public static $namespace = 'property value';
+
+    public static function namespace() {
+        return 'method value';
+    }
+}
+
+echo Foo::NAMESPACE, PHP_EOL;
+echo Bar::Namespace, PHP_EOL;
+echo Baz::nAmEsPaCe, PHP_EOL;
+echo Yoo::namespace->value, PHP_EOL;
+echo Sup::namespace, PHP_EOL;
+echo Can::$namespace, PHP_EOL;
+echo Can::namespace(), PHP_EOL;
+echo constant('namespace'), PHP_EOL;
+
+?>
+--EXPECTF--
+Deprecated: Declaring class constant called 'namespace' is deprecated in %s on line %d
+
+Deprecated: Declaring interface constant called 'namespace' is deprecated in %s on line %d
+
+Deprecated: Declaring enum constant called 'namespace' is deprecated in %s on line %d
+
+Deprecated: Declaring trait constant called 'namespace' is deprecated in %s on line %d
+
+Deprecated: Declaring enum constant called 'namespace' is deprecated in %s on line %d
+class constant value
+interface constant value
+enum constant value
+enum case value
+trait constant value
+property value
+method value
+global constant value

Zend/tests/exceptions/gh16188.phpt

@@ -16,6 +16,7 @@ printf("__toString:\n%s\n\n", $re);
 ?>
 ==DONE==
 --EXPECTF--
+Deprecated: array_walk(): Passing an object for argument #1 $array to array_walk() is deprecated, call get_object_vars() first instead in %s on line %d
 getTraceAsString:
 #0 {main}
 

Zend/tests/functions/readonly_as_fn_name_is_deprecated.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Naming a function readonly is deprecated
+--FILE--
+<?php
+
+function readonly() {}
+
+?>
+DONE
+--EXPECTF--
+Deprecated: Calling a function “readonly” is deprecated in %s on line %d
+DONE