sync

.cirrus.yml

@@ -385,6 +385,7 @@ arm_task:
         -d opcache.jit=function
         -P -q -x -j2
         -g FAIL,BORK,LEAK,XLEAK
+        --no-progress
         --offline
         --show-diff
         --show-slow 1000
@@ -397,6 +398,7 @@ arm_task:
         -d opcache.jit=tracing
         -P -q -x -j2
         -g FAIL,BORK,LEAK,XLEAK
+        --no-progress
         --offline
         --show-diff
         --show-slow 1000

.gitattributes

@@ -22,7 +22,7 @@
 # Collapse generated files within a pull request.
 **/*_arginfo.h linguist-generated
 /Zend/zend_vm_execute.h linguist-generated
-/Zend/zend_vm_opcodes.{h,c} linguist-generated
+/Zend/zend_vm_opcodes.[ch] linguist-generated
 
 # The OSS fuzz files are bunary
 /ext/date/tests/ossfuzz*.txt binary

CODEOWNERS

@@ -14,10 +14,12 @@
 /ext/curl @adoy
 /ext/date @derickr
 /ext/dba @Girgias
+/ext/dom @nielsdos
 /ext/ffi @dstogov
 /ext/gmp @Girgias
 /ext/imap @Girgias
 /ext/json @bukka
+/ext/libxml @nielsdos
 /ext/mbstring @alexdowad
 /ext/opcache @dstogov @iluuu1994
 /ext/openssl @bukka
@@ -26,6 +28,7 @@
 /ext/session @Girgias
 /ext/sockets @devnexen
 /ext/spl @Girgias
+/ext/standard @bukka
 /main @bukka
 /sapi/fpm @bukka
 /Zend @iluuu1994

NEWS

@@ -1,6 +1,26 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.3.0alpha1
+?? ??? ????, PHP 8.3.0alpha2
+
+- Core:
+  . Fix GH-11388 (Allow "final" modifier when importing a method from a trait).
+    (nielsdos)
+  . Fixed bug GH-11406 (segfault with unpacking and magic method closure).
+    (nielsdos)
+
+- DOM:
+  . Fix #79700 (wrong use of libxml oldNs leads to performance problem).
+    (nielsdos)
+  . Fix #77894 (DOMNode::C14N() very slow on generated DOMDocuments even after
+    normalisation). (nielsdos)
+
+- Streams:
+  . Implement GH-8641 (STREAM_NOTIFY_COMPLETED over HTTP never emitted).
+    (nielsdos, Jakub Zelenka)
+  . Fix bug GH-10406 (fgets on a redis socket connection fails on PHP 8.3).
+    (Jakub Zelenka)
+
+08 Jun 2023, PHP 8.3.0alpha1
 
 - CLI:
   . Added pdeathsig to builtin server to terminate workers when the master
@@ -35,10 +55,21 @@ PHP                                                                        NEWS
     has inherited it from its parent). (ilutov)
   . Fix bug GH-11154 (Negative indices on empty array don't affect next chosen
     index). (ColinHDev)
+  . Fix bug GH-8846 (Implement delayed early binding for classes without
+    parents). (ilutov)
+  . Fix bug #79836 (Segfault in concat_function). (nielsdos)
+  . Fix bug #81705 (type confusion/UAF on set_error_handler with concat
+    operation). (nielsdos)
+  . Fix GH-11348 (Closure created from magic method does not accept named
+    arguments). (nielsdos)
 
 - Date:
   . Implement More Appropriate Date/Time Exceptions RFC. (Derick)
 
+- DOM:
+  . Fix bug GH-8388 (DOMAttr unescapes character reference). (Tim Starling)
+  . Fix bug GH-11308 (getElementsByTagName() is O(N^2)). (nielsdos)
+
 - Exif:
   . Removed unneeded codepaths in exif_process_TIFF_in_JPEG(). (nielsdos)
 
@@ -115,6 +146,12 @@ PHP                                                                        NEWS
   . Added memfd api usage, on Linux, for zend_shared_alloc_create_lock()
     to create an abstract anonymous file for the opcache's lock. (Max Kellermann)
 
+- OpenSSL:
+  . Added OPENSSL_CMS_OLDMIMETYPE and PKCS7_NOOLDMIMETYPE contants to switch
+    between mime content types. (Daniel Kesselberg)
+  . Fixed GH-11054: Reset OpenSSL errors when using a PEM public key.
+    (Florian Moser)
+
 - PCNTL:
   . SA_ONSTACK is now set for pcntl_signal. (Kévin Dunglas)
   . Added SIGINFO constant. (David Carlier)
@@ -126,6 +163,11 @@ PHP                                                                        NEWS
   . pg_cancel use thread safe PQcancel api instead. (David Carlier)
   . pg_trace new PGSQL_TRACE_SUPPRESS_TIMESTAMPS/PGSQL_TRACE_REGRESS_MODE
     contants support. (David Carlier)
+  . pg_set_error_verbosity adding PGSQL_ERRORS_STATE constant. (David Carlier)
+  . pg_convert/pg_insert E_WARNING on type errors had been converted to
+    ValueError/TypeError exceptions. (David Carlier)
+  . Added pg_set_error_context_visibility to set the context's visibility
+    within the error messages. (David Carlier)
 
 - Phar:
   . Fix memory leak in phar_rename_archive(). (stkeke)
@@ -152,6 +194,10 @@ PHP                                                                        NEWS
   . Fix Segfault when using ReflectionFiber suspended by an internal function.
     (danog)
 
+- SAPI:
+  . Fixed GH-11141 (Could not open input file: should be sent to stderr).
+    (nielsdos)
+
 - Sockets:
   . Added SO_ATTACH_REUSEPORT_CBPF socket option, to give tighter control
     over socket binding for a cpu core. (David Carlier)
@@ -184,10 +230,14 @@ PHP                                                                        NEWS
   . Fix GH-11010 (parse_ini_string() now preserves formatting of unquoted
     strings starting with numbers when the INI_SCANNER_TYPED flag is
     specified). (ilutov)
+  . Fix GH-10742 (http_response_code emits no error when headers were already
+    sent). (NattyNarwhal)
 
 - Streams:
   . Fixed bug #51056: blocking fread() will block even if data is available.
     (Jakub Zelenka)
+  . Added storing of the original path used to open xport stream.
+    (Luc Vieillescazes)
 
 - XSLTProcessor:
   . Fixed bug #69168 (DomNode::getNodePath() returns invalid path). (nielsdos)

UPGRADING

@@ -41,6 +41,12 @@ PHP 8.3 UPGRADE NOTES
     property to the class directly without traits.
   . Assigning a negative index n to an empty array will now make sure that the
     next index is n+1 instead of 0.
+  . Static variable initializers can now contain arbitrary expressions.
+    RFC: https://wiki.php.net/rfc/arbitrary_static_variable_initializers
+
+- DOM:
+  . Assignment to DOMAttr::$value and DOMAttr::$nodeValue no longer expands
+    entities in the new value.
 
 - FFI:
   . C functions that have a return type of void now return null instead of
@@ -56,6 +62,8 @@ PHP 8.3 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/readonly_amendments
   . Class, interface, trait, and enum constants now support type
     declarations. RFC: https://wiki.php.net/rfc/typed_class_constants
+  . Closures created from magic methods can now accept named arguments.
+  . The final modifier may now be used when using a method from a trait.
 
 - Posix
   . posix_getrlimit() now takes an optional $res parameter to allow fetching a
@@ -64,6 +72,10 @@ PHP 8.3 UPGRADE NOTES
   . posix_ttyname() now raises type warnings for integers following the usual ZPP semantics
     and value warnings for invalid file descriptor integers.
 
+- Streams
+  . Streams can now emit the STREAM_NOTIFY_COMPLETED notification. This was previously
+    not implemented.
+
 ========================================
 3. Changes in SAPI modules
 ========================================
@@ -144,6 +156,8 @@ PHP 8.3 UPGRADE NOTES
   . pg_fetch_object now raises a ValueError instead of an Exception when the constructor_args
     argument is non empty with the class not having constructor.
   . pg_insert now raises a ValueError instead of a WARNING when the table specified is invalid.
+  . pg_insert and pg_convert raises a ValueError or a TypeError instead of a WARNING when the
+    value/type of a field does not match properly with a PostGreSQL's type.
 
 - Standard:
   . E_NOTICEs emitted by unserialize() have been promoted to E_WARNING.
@@ -178,6 +192,9 @@ PHP 8.3 UPGRADE NOTES
   . Added posix_fpathconf call to get configuration value from a file descriptor.
   . Added posix_eaccess call to check the effective user id's permission for a path.
 
+- PGSQL:
+  . Added pg_set_error_context_visilibity to set the visibility of the context in error messages.
+
 - Random:
   . Added Randomizer::getBytesFromString().
     RFC: https://wiki.php.net/rfc/randomizer_additions
@@ -214,12 +231,17 @@ PHP 8.3 UPGRADE NOTES
   . MIXED_NUMBERS (Spoofchecker).
   . HIDDEN_OVERLAY (Spoofchecker).
 
+- OpenSSL:
+  . OPENSSL_CMS_OLDMIMETYPE
+  . PKCS7_NOOLDMIMETYPE
+
 - PCNTL:
   . SIGINFO
 
 - PGSQL:
   . PGSQL_TRACE_SUPPRESS_TIMESTAMPS.
   . PGSQL_TRACE_REGRESS_MODE.
+  . PGSQL_ERRORS_SQLSTATE.
 
 - Posix:
   . POSIX_SC_ARG_MAX.

UPGRADING.INTERNALS

@@ -116,6 +116,31 @@ PHP 8.3 INTERNALS UPGRADE NOTES
    - The PHPAPI spl_iterator_apply() function now returns zend_result instead of int.
      There are no functional changes.
 
+ f. ext/dom
+   - A new function dom_get_doc_props_read_only() is added to gather the document
+     properties in a read-only way. This function avoids allocation when there are
+     no document properties changed yet.
+   - The node list returned by DOMNode::getElementsByTagName() and
+	 DOMNode::getElementsByTagNameNS() now caches the length and the last requested item.
+	 This means that the length and the last requested item are not recalculated
+	 when the node list is iterated over multiple times.
+	 If you do not use the internal PHP dom APIs to modify the document, you need to
+	 manually invalidate the cache using php_libxml_invalidate_node_list_cache_from_doc().
+	 Furthermore, the following internal APIs were added to handle the cache:
+	   . php_dom_is_cache_tag_stale_from_doc_ptr()
+	   . php_dom_is_cache_tag_stale_from_node()
+	   . php_dom_mark_cache_tag_up_to_date_from_node()
+   - The function dom_get_elements_by_tag_name_ns_raw() has an additional parameter to indicate
+     the base node of the node list. This function also no longer accepts -1 as the index argument.
+   - The function dom_namednode_iter() has additional arguments to avoid recomputing the length of
+     the strings.
+   - The functions dom_parent_node_prepend(), dom_parent_node_append(), dom_parent_node_after(), and
+     dom_parent_node_before() now use an uint32_t argument for the number of nodes instead of int.
+
+ g. ext/libxml
+   - Two new functions: php_libxml_invalidate_node_list_cache_from_doc() and
+     php_libxml_invalidate_node_list_cache() were added to invalidate the cache of a node list.
+
 ========================
 4. OpCode changes
 ========================

Zend/Optimizer/block_pass.c

@@ -264,6 +264,10 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 				break;
 
 			case ZEND_FREE:
+				/* Note: Only remove the source if the source is local to this block.
+				 * If it's not local, then the other blocks successors must also eventually either FREE or consume the temporary,
+				 * hence removing the temporary is not safe in the general case, especially when other consumers are not FREE.
+				 * A FREE may not be removed without also removing the source's result, because otherwise that would cause a memory leak. */
 				if (opline->op1_type == IS_TMP_VAR) {
 					src = VAR_SOURCE(opline->op1);
 					if (src) {
@@ -272,6 +276,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 							case ZEND_BOOL_NOT:
 								/* T = BOOL(X), FREE(T) => T = BOOL(X) */
 								/* The remaining BOOL is removed by a separate optimization */
+								/* The source is a bool, no source removals take place, so this may be done non-locally. */
 								VAR_SOURCE(opline->op1) = NULL;
 								MAKE_NOP(opline);
 								++(*opt_count);
@@ -290,6 +295,9 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 							case ZEND_PRE_DEC_OBJ:
 							case ZEND_PRE_INC_STATIC_PROP:
 							case ZEND_PRE_DEC_STATIC_PROP:
+								if (src < op_array->opcodes + block->start) {
+									break;
+								}
 								src->result_type = IS_UNUSED;
 								VAR_SOURCE(opline->op1) = NULL;
 								MAKE_NOP(opline);
@@ -302,7 +310,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 				} else if (opline->op1_type == IS_VAR) {
 					src = VAR_SOURCE(opline->op1);
 					/* V = OP, FREE(V) => OP. NOP */
-					if (src &&
+					if (src >= op_array->opcodes + block->start &&
 					    src->opcode != ZEND_FETCH_R &&
 					    src->opcode != ZEND_FETCH_STATIC_PROP_R &&
 					    src->opcode != ZEND_FETCH_DIM_R &&
@@ -1002,6 +1010,7 @@ static void assemble_code_blocks(zend_cfg *cfg, zend_op_array *op_array, zend_op
 			case ZEND_COALESCE:
 			case ZEND_ASSERT_CHECK:
 			case ZEND_JMP_NULL:
+			case ZEND_BIND_INIT_STATIC_OR_JMP:
 				ZEND_SET_OP_JMP_ADDR(opline, opline->op2, new_opcodes + blocks[b->successors[0]].start);
 				break;
 			case ZEND_CATCH:

Zend/Optimizer/dce.c

@@ -145,6 +145,7 @@ static inline bool may_have_side_effects(
 		case ZEND_COALESCE:
 		case ZEND_ASSERT_CHECK:
 		case ZEND_JMP_NULL:
+		case ZEND_BIND_INIT_STATIC_OR_JMP:
 			/* For our purposes a jumps and branches are side effects. */
 			return 1;
 		case ZEND_BEGIN_SILENCE:
@@ -245,15 +246,9 @@ static inline bool may_have_side_effects(
 				if ((opline->extended_value & (ZEND_BIND_IMPLICIT|ZEND_BIND_EXPLICIT))) {
 					return 1;
 				}
-
-				if ((opline->extended_value & ZEND_BIND_REF) != 0) {
-					zval *value =
-						(zval*)((char*)op_array->static_variables->arData +
-							(opline->extended_value & ~ZEND_BIND_REF));
-					if (Z_TYPE_P(value) == IS_CONSTANT_AST) {
-						/* AST may contain undefined constants */
-						return 1;
-					}
+				/* Modifies static variables which are observable through reflection */
+				if ((opline->extended_value & ZEND_BIND_REF) && opline->op2_type != IS_UNUSED) {
+					return 1;
 				}
 			}
 			return 0;

Zend/Optimizer/dfa_pass.c

@@ -652,6 +652,7 @@ static void zend_ssa_replace_control_link(zend_op_array *op_array, zend_ssa *ssa
 			case ZEND_COALESCE:
 			case ZEND_ASSERT_CHECK:
 			case ZEND_JMP_NULL:
+			case ZEND_BIND_INIT_STATIC_OR_JMP:
 				if (ZEND_OP2_JMP_ADDR(opline) == op_array->opcodes + old->start) {
 					ZEND_SET_OP_JMP_ADDR(opline, opline->op2, op_array->opcodes + dst->start);
 				}

Zend/Optimizer/pass1.c

@@ -354,6 +354,7 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 		case ZEND_ASSERT_CHECK:
 		case ZEND_JMP_NULL:
 		case ZEND_VERIFY_NEVER_TYPE:
+		case ZEND_BIND_INIT_STATIC_OR_JMP:
 			collect_constants = 0;
 			break;
 		}

Zend/Optimizer/sccp.c

@@ -249,6 +249,7 @@ static bool can_replace_op1(
 		case ZEND_ROPE_ADD:
 		case ZEND_ROPE_END:
 		case ZEND_BIND_STATIC:
+		case ZEND_BIND_INIT_STATIC_OR_JMP:
 		case ZEND_BIND_GLOBAL:
 		case ZEND_MAKE_REF:
 		case ZEND_UNSET_CV:
@@ -1773,6 +1774,7 @@ static void sccp_mark_feasible_successors(
 		case ZEND_CATCH:
 		case ZEND_FE_FETCH_R:
 		case ZEND_FE_FETCH_RW:
+		case ZEND_BIND_INIT_STATIC_OR_JMP:
 			scdf_mark_edge_feasible(scdf, block_num, block->successors[0]);
 			scdf_mark_edge_feasible(scdf, block_num, block->successors[1]);
 			return;

Zend/Optimizer/zend_cfg.c

@@ -369,6 +369,7 @@ ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array,
 			case ZEND_COALESCE:
 			case ZEND_ASSERT_CHECK:
 			case ZEND_JMP_NULL:
+			case ZEND_BIND_INIT_STATIC_OR_JMP:
 				BB_START(OP_JMP_ADDR(opline, opline->op2) - op_array->opcodes);
 				BB_START(i + 1);
 				break;
@@ -522,6 +523,7 @@ ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array,
 			case ZEND_COALESCE:
 			case ZEND_ASSERT_CHECK:
 			case ZEND_JMP_NULL:
+			case ZEND_BIND_INIT_STATIC_OR_JMP:
 				block->successors_count = 2;
 				block->successors[0] = block_map[OP_JMP_ADDR(opline, opline->op2) - op_array->opcodes];
 				block->successors[1] = j + 1;

Zend/Optimizer/zend_dfg.c

@@ -150,6 +150,7 @@ static zend_always_inline void _zend_dfg_add_use_def_op(const zend_op_array *op_
 		case ZEND_POST_DEC:
 		case ZEND_BIND_GLOBAL:
 		case ZEND_BIND_STATIC:
+		case ZEND_BIND_INIT_STATIC_OR_JMP:
 		case ZEND_SEND_VAR_NO_REF:
 		case ZEND_SEND_VAR_NO_REF_EX:
 		case ZEND_SEND_VAR_EX: