Merge branch 'PHP-8.6' into master

* PHP-8.6:
  Add NEWS entry
  Avoid state corruption via bailout

Author: iluuu1994

Zend/tests/bug40770.phpt

@@ -16,9 +16,9 @@ if ($zend_mm_enabled === "0") {
 <?php
 ini_set('display_errors',true);
 $mb=148;
-$var = '';
+$var = [];
 for ($i=0; $i<=$mb; $i++) {
-        $var.= str_repeat('a',1*1024*1024);
+        $var[] = str_repeat('a',1*1024*1024);
 }
 ?>
 --EXPECTF--

Zend/tests/class_alias/bug54268.phpt

@@ -2,6 +2,7 @@
 Bug #54268 (Double free when destroy_zend_class fails)
 --INI--
 memory_limit=8M
+opcache.jit=disable
 --SKIPIF--
 <?php
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");

Zend/tests/debug_backtrace_sensitive_named_variadic.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Backtrace args of a #[SensitiveParameter] variadic called with named arguments
+--FILE--
+<?php
+class E extends Exception {}
+
+function outer(#[SensitiveParameter] ...$args) {
+    return new E();
+}
+
+var_dump(outer(a: 1, b: 'secret')->getTrace()[0]['args']);
+?>
+--EXPECT--
+array(2) {
+  ["a"]=>
+  object(SensitiveParameterValue)#2 (0) {
+  }
+  ["b"]=>
+  object(SensitiveParameterValue)#3 (0) {
+  }
+}

Zend/tests/fibers/get-return-after-bailout.phpt

@@ -1,12 +1,5 @@
 --TEST--
 Fiber::getReturn() after bailout
---SKIPIF--
-<?php
-$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
-if ($zend_mm_enabled === "0") {
-    die("skip Zend MM disabled");
-}
-?>
 --FILE--
 <?php
 
@@ -16,13 +9,13 @@ register_shutdown_function(static function (): void {
 });
 
 $fiber = new Fiber(static function (): void {
-    str_repeat('X', PHP_INT_MAX);
+    var_dump(new class { public function __debugInfo() { return ''; } }); // cause a bailout
 });
 $fiber->start();
 
 ?>
 --EXPECTF--
-Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) %sget-return-after-bailout.php on line %d
+Fatal error: __debugInfo() must return an array in %s on line %d
 
 Fatal error: Uncaught FiberError: Cannot get fiber return value: The fiber exited with a fatal error in %sget-return-after-bailout.php:%d
 Stack trace:

Zend/tests/gh11189.phpt

@@ -8,7 +8,7 @@ if (PHP_OS_FAMILY === 'Windows') {
 if (getenv("USE_ZEND_ALLOC") === "0") die("skip ZMM is disabled");
 ?>
 --INI--
-memory_limit=2M
+memory_limit=10M
 --FILE--
 <?php
 
@@ -29,5 +29,4 @@ while (1) {
 
 ?>
 --EXPECTF--
-Success
-Fatal error: Allowed memory size of %s bytes exhausted%s(tried to allocate %s bytes) in %s on line %d
+Fatal error: Allowed memory size of 10485760 bytes exhausted %S(tried to allocate %d bytes) in %s on line %d

Zend/tests/gh11189_1.phpt

@@ -29,5 +29,4 @@ while (1) {
 
 ?>
 --EXPECTF--
-Success
-Fatal error: Allowed memory size of %s bytes exhausted%s(tried to allocate %s bytes) in %s on line %d
+Fatal error: Allowed memory size of 2097152 bytes exhausted %S(tried to allocate %d bytes) in %s on line %d

Zend/tests/oom_SplFixedArray___unserialize.phpt

@@ -0,0 +1,20 @@
+--TEST--
+OOM SplFixedArray::__unserialize()
+--INI--
+memory_limit=10M
+--FILE--
+<?php
+
+$elems = [];
+for ($i = 0; $i < 64*1024; $i++) {
+    $elems[] = "i:$i;N;";
+}
+$payload = 'O:13:"SplFixedArray":' . count($elems) . ':{' . implode('', $elems) . '}';
+
+$pad = str_repeat('a', max(10*1024*1024 - memory_get_usage(true) - 512*1024, 1));
+
+unserialize($payload);
+
+?>
+--EXPECTF--
+Fatal error: Allowed memory size of 10485760 bytes exhausted %S(tried to allocate %d bytes) in %s on line 11

Zend/tests/oom_SplFixedArray___wakeup.phpt

@@ -0,0 +1,21 @@
+--TEST--
+OOM SplFixedArray::fromArray() 003
+--INI--
+memory_limit=16M
+--FILE--
+<?php
+
+$a = new SplFixedArray();
+for ($i = 0; $i < 128*1024; $i++) {
+    @$a->{$i} = 0;
+}
+
+$pad = str_repeat('a', max(16*1024*1024 - memory_get_usage(true) - 512*1024, 1));
+
+$a->__wakeup();
+
+?>
+--EXPECTF--
+Deprecated: Method SplFixedArray::__wakeup() is deprecated since 8.4, this method is obsolete, as serialization hooks are provided by __unserialize() and __serialize() in %s on line %d
+
+Fatal error: Allowed memory size of 16777216 bytes exhausted %S(tried to allocate %d bytes) in %s on line 10

Zend/tests/oom_SplFixedArray_copy_ctor.phpt

@@ -0,0 +1,16 @@
+--TEST--
+OOM SplFixedArray copy ctor
+--INI--
+memory_limit=10M
+--FILE--
+<?php
+
+$a = new SplFixedArray(64*1024);
+
+$pad = str_repeat('a', max(10*1024*1024 - memory_get_usage(true) - 1*1024*1024, 1));
+
+clone $a;
+
+?>
+--EXPECTF--
+Fatal error: Allowed memory size of 10485760 bytes exhausted %S(tried to allocate %d bytes) in %s on line 7

Zend/tests/oom_SplFixedArray_fromArray_001.phpt

@@ -0,0 +1,12 @@
+--TEST--
+OOM SplFixedArray::fromArray()
+--INI--
+memory_limit=10M
+--FILE--
+<?php
+
+SplFixedArray::fromArray([10*1024*1024 => 0], true);
+
+?>
+--EXPECTF--
+Fatal error: Allowed memory size of 10485760 bytes exhausted %S(tried to allocate %d bytes) in %s on line 3