Merge remote-tracking branch 'upstream/master' into upstream_rfc/scoped_rng_for_pr

Author: zeriyoshi

.editorconfig

@@ -9,7 +9,7 @@ end_of_line              = lf
 charset                  = utf-8
 tab_width                = 4
 
-[{*.{awk,bat,c,cpp,d,h,l,re,skl,w32,y},Makefile*}]
+[{*.{awk,bat,c,cpp,d,dasc,h,l,re,skl,w32,y},Makefile*}]
 indent_size              = 4
 indent_style             = tab
 

NEWS

@@ -4,23 +4,38 @@ PHP                                                                        NEWS
 
 - CLI:
   . Updated the mime-type table for the builtin-server. (Ayesh Karunaratne)
-  . Fixed potential overflow for the builtin server via the PHP_CLI_SERVER_WORKERS
-    environment variable. (yiyuaner)
+  . Fixed potential overflow for the builtin server via the
+    PHP_CLI_SERVER_WORKERS environment variable. (yiyuaner)
+  . Fixed GH-8575 by changing STDOUT, STDERR and STDIN to not close on resource
+    destruction. (Jakub Zelenka)
 
 - Core:
   . Reduced the memory footprint of strings returned by var_export(),
     json_encode(), serialize(), iconv_*(), mb_ereg*(), session_create_id(),
     http_build_query(), strstr(), Reflection*::__toString(). (Arnaud)
   . Fixed bug GH-8995 (WeakMap object reference offset causing TypeError).
     (Tobias Bachert)
+  . Added error_log_mode ini setting. (Mikhail Galanin)
+  . Updated request startup messages. (Eric Norris)
 
 - COM:
   . Fixed bug GH-8750 (Can not create VT_ERROR variant type). (cmb)
 
+- Filter:
+  . Added FILTER_FLAG_GLOBAL_RANGE to filter Global IPs. (vnsavage)
+
 - FPM:
   . Added listen.setfib pool option to set route FIB on FreeBSD. (David Carlier)
   . Added access.suppress_path pool option to filter access log entries.
     (Mark Gallagher)
+  . Fixed on fpm scoreboard occasional warning on acquisition failure.
+    (Felix Wiedemann)
+
+- Opcache:
+  . Added initial support for JIT performance profiling generation
+    for macOs Instrument. (David Carlier)
+  . Fixed bug GH-8030 (Segfault with JIT and large match/switch statements).
+    (Arnaud)
 
 - PCRE:
   . Updated bundled libpcre to 10.40. (cmb)

UPGRADING

@@ -74,6 +74,12 @@ PHP 8.2 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/readonly_classes
   . Added support for true type.
     RFC: https://wiki.php.net/rfc/true-type
+  . Added support for Disjoint Normal Form (DNF) types.
+    RFC: https://wiki.php.net/rfc/dnf_types
+  . Added error_log_mode ini setting that allows setting of permissions for
+    error log file.
+  . Added support for fetching properties of enums in constant expressions.
+    RFC: https://wiki.php.net/rfc/fetch_property_in_const_expressions
 
 
 - Curl:
@@ -345,6 +351,9 @@ PHP 8.2 UPGRADE NOTES
   . CURL_VERSION_UNICODE (libcurl >= 7.72.0)
   . CURL_VERSION_ZSTD (libcurl >= 7.72.0)
 
+- Filter
+  . FILTER_FLAG_GLOBAL_RANGE
+
 - Sockets:
   . SO_INCOMING_CPU
   . SO_MEMINFO
@@ -473,6 +482,11 @@ PHP 8.2 UPGRADE NOTES
 13. Other Changes
 ========================================
 
+- CLI:
+  . The STDOUT, STDERR and STDIN are no longer closed on resource destruction
+    which is mostly when the CLI finishes. It is however still possible to
+    explicitly close those streams using fclose and similar.
+
 - Core:
   . The iterable type is now a built-in compile time alias for array|Traversable.
     Error messages relating to iterable will therefore now use array|Traversable.

Zend/Optimizer/zend_inference.c

@@ -1961,6 +1961,9 @@ static uint32_t assign_dim_array_result_type(
 			value_type |= MAY_BE_NULL;
 		}
 		if (dim_op_type == IS_UNUSED) {
+			if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
+				tmp |= MAY_BE_ARRAY_PACKED;
+			}
 			tmp |= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
 		} else {
 			if (dim_type & (MAY_BE_LONG|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_RESOURCE|MAY_BE_DOUBLE)) {
@@ -3377,7 +3380,12 @@ static zend_always_inline zend_result _zend_update_type_info(
 						ZEND_ASSERT(j < 0 && "There should only be one use");
 					}
 				}
-				if (((tmp & MAY_BE_ARRAY) && (tmp & MAY_BE_ARRAY_KEY_ANY)) || opline->opcode == ZEND_FETCH_DIM_FUNC_ARG) {
+				if (((tmp & MAY_BE_ARRAY) && (tmp & MAY_BE_ARRAY_KEY_ANY))
+				 || opline->opcode == ZEND_FETCH_DIM_FUNC_ARG
+				 || opline->opcode == ZEND_FETCH_DIM_R
+				 || opline->opcode == ZEND_FETCH_DIM_IS
+				 || opline->opcode == ZEND_FETCH_DIM_UNSET
+				 || opline->opcode == ZEND_FETCH_LIST_R) {
 					UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
 				} else {
 					/* invalid key type */

Zend/tests/fibers/signal-async.phpt

@@ -0,0 +1,37 @@
+--TEST--
+Prevent switching fibers when async signals are enabled
+--EXTENSIONS--
+pcntl
+posix
+--FILE--
+<?php
+
+pcntl_async_signals(true);
+
+pcntl_signal(SIGUSR1, function (): void {
+    if (Fiber::getCurrent() !== null) {
+        Fiber::suspend();
+    }
+});
+
+$fiber = new Fiber(function (): void {
+    echo "Fiber start\n";
+    posix_kill(posix_getpid(), SIGUSR1);
+    time_nanosleep(1);
+    echo "Fiber end\n";
+});
+
+$fiber->start();
+
+?>
+--EXPECTF--
+Fiber start
+
+Fatal error: Uncaught FiberError: Cannot switch fibers in current execution context in %ssignal-async.php:%d
+Stack trace:
+#0 %ssignal-async.php(%d): Fiber::suspend()
+#1 %ssignal-async.php(%d): {closure}(%d, Array)
+#2 [internal function]: {closure}()
+#3 %ssignal-async.php(%d): Fiber->start()
+#4 {main}
+  thrown in %ssignal-async.php on line %d

Zend/tests/fibers/signal-dispatch.phpt

@@ -0,0 +1,46 @@
+--TEST--
+Prevent switching fibers when dispatching pending signals
+--EXTENSIONS--
+pcntl
+posix
+--FILE--
+<?php
+
+pcntl_signal(SIGUSR1, function (): void {
+    if (Fiber::getCurrent() !== null) {
+        Fiber::suspend();
+    }
+});
+
+$fiber = new Fiber(function (): void {
+    echo "Fiber start\n";
+
+    posix_kill(posix_getpid(), SIGUSR1);
+
+    try {
+        pcntl_signal_dispatch();
+    } catch (FiberError $e) {
+        Fiber::suspend($e);
+    }
+
+    echo "Fiber end\n";
+});
+
+$e = $fiber->start();
+
+echo $e, "\n";
+
+$fiber->resume();
+
+?>
+--EXPECTF--
+Fiber start
+FiberError: Cannot switch fibers in current execution context in %ssignal-dispatch.php:%d
+Stack trace:
+#0 %ssignal-dispatch.php(%d): Fiber::suspend()
+#1 [internal function]: {closure}(%d, Array)
+#2 %ssignal-dispatch.php(%d): pcntl_signal_dispatch()
+#3 [internal function]: {closure}()
+#4 %ssignal-dispatch.php(%d): Fiber->start()
+#5 {main}
+Fiber end

Zend/tests/fibers/ticks.phpt

@@ -0,0 +1,33 @@
+--TEST--
+Prevent switching fibers in tick function
+--FILE--
+<?php
+
+declare(ticks=1);
+
+register_tick_function(function (): void {
+    if (Fiber::getCurrent() !== null) {
+        Fiber::suspend();
+    }
+});
+
+$fiber = new Fiber(function (): void {
+    echo "1\n";
+    echo "2\n";
+    echo "3\n";
+});
+
+$fiber->start();
+
+?>
+--EXPECTF--
+1
+
+Fatal error: Uncaught FiberError: Cannot switch fibers in current execution context in %sticks.php:%d
+Stack trace:
+#0 %sticks.php(%d): Fiber::suspend()
+#1 %sticks.php(%d): {closure}()
+#2 [internal function]: {closure}()
+#3 %sticks.php(%d): Fiber->start()
+#4 {main}
+  thrown in %sticks.php on line %d

Zend/tests/prop_const_expr/attributes.phpt

@@ -0,0 +1,44 @@
+--TEST--
+Allow fetching properties in attributes
+--EXTENSIONS--
+reflection
+--FILE--
+<?php
+
+enum A: string {
+    case B = 'C';
+}
+
+#[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)]
+class Attr {
+    public function __construct(public $value) {}
+}
+
+#[Attr(A::B->name)]
+#[Attr(A::B->value)]
+#[Attr(A::B?->name)]
+#[Attr(A::B?->value)]
+class C {}
+
+foreach ((new ReflectionClass(C::class))->getAttributes() as $reflectionAttribute) {
+    var_dump($reflectionAttribute->newInstance());
+}
+
+?>
+--EXPECT--
+object(Attr)#1 (1) {
+  ["value"]=>
+  string(1) "B"
+}
+object(Attr)#1 (1) {
+  ["value"]=>
+  string(1) "C"
+}
+object(Attr)#1 (1) {
+  ["value"]=>
+  string(1) "B"
+}
+object(Attr)#1 (1) {
+  ["value"]=>
+  string(1) "C"
+}

Zend/tests/prop_const_expr/basic.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Allow fetching properties in constant expressions on enums
+--FILE--
+<?php
+
+enum A: string {
+    case Case = 'A::Case';
+}
+
+const A_name = A::Case->name;
+const A_value = A::Case->value;
+
+var_dump(A_name);
+var_dump(A_value);
+
+const A_name_nullsafe = A::Case?->name;
+const A_value_nullsafe = A::Case?->value;
+
+var_dump(A_name_nullsafe);
+var_dump(A_value_nullsafe);
+
+?>
+--EXPECT--
+string(4) "Case"
+string(7) "A::Case"
+string(4) "Case"
+string(7) "A::Case"

Zend/tests/prop_const_expr/basic_nullsafe.phpt

@@ -0,0 +1,46 @@
+--TEST--
+Nullsafe property constant expression
+--FILE--
+<?php
+
+class Printer {
+    public function __construct() {
+        echo "Printer\n";
+    }
+}
+
+const A = (null)?->test;
+var_dump(A);
+
+const B = (null)?->test->test;
+var_dump(B);
+
+const C = (null)->test?->test;
+var_dump(C);
+
+const D = (null)?->test['test'];
+var_dump(D);
+
+const E = (null)['test']?->test;
+var_dump(E);
+
+const F = (null)?->{new Printer};
+var_dump(F);
+
+const G = (null)?->test + (new Printer ? 1 : 0);
+var_dump(G);
+
+?>
+--EXPECTF--
+NULL
+NULL
+
+Warning: Attempt to read property "test" on null in %s on line %d
+NULL
+NULL
+
+Warning: Trying to access array offset on value of type null in %s on line %d
+NULL
+NULL
+Printer
+int(1)