sync

.github/workflows/remove-needs-feedback.yml

@@ -13,3 +13,6 @@ jobs:
       - uses: actions-ecosystem/action-remove-labels@v1
         with:
           labels: "Status: Needs Feedback"
+      - uses: actions-ecosystem/action-add-labels@v1
+        with:
+          labels: "Status: Needs Triage"

CONTRIBUTING.md

@@ -80,7 +80,7 @@ repository. Mailing list subscription is explained on the
 [mailing lists page](https://www.php.net/mailing-lists.php).
 
 You may also want to read
-[The Mysterious PHP RFC Process](https://blogs.oracle.com/opal/entry/the_mysterious_php_rfc_process)
+[The Mysterious PHP RFC Process](https://blogs.oracle.com/opal/post/the-mysterious-php-rfc-process-and-how-you-can-change-the-web)
 for additional notes on the best way to approach submitting an RFC.
 
 ## Writing tests

NEWS

@@ -13,10 +13,13 @@ PHP                                                                        NEWS
 
 - OCI8:
   . Added oci8.prefetch_lob_size directive to tune LOB query performance
+  . Support for building against Oracle Client libraries 10.1 and 10.2 has been
+    dropped. Oracle Client libraries 11.2 or newer are now required.
 
 - Standard:
   . net_get_interfaces() also reports wireless network interfaces on Windows.
     (Yurun)
+  . Finished AVIF support in getimagesize(). (Yannis Guyon)
 
 - Zip:
   . add ZipArchive::clearError() method

README.REDIST.BINS

@@ -15,6 +15,7 @@
 15. ext/phar/zip.c portion extracted from libzip
 16. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/LICENSE
 17. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
+18. avifinfo (ext/standard/libavifinfo) see ext/standard/libavifinfo/LICENSE
 
 
 3. pcre2lib (ext/pcre)
@@ -591,7 +592,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-16. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
+17. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
 
 The OpenLDAP Public License
   Version 2.8, 17 August 2003

UPGRADING

@@ -19,6 +19,14 @@ PHP 8.2 UPGRADE NOTES
 1. Backward Incompatible Changes
 ========================================
 
+- Standard:
+  . strtolower() and strtoupper() are no longer locale-sensitive. They now
+    perform ASCII case conversion, as if the locale were "C". Use
+    mb_strtolower() if you want localized case conversion. Similarly, stristr,
+    stripos, strripos, lcfirst, ucfirst, ucwords, str_ireplace,
+    array_change_key_case and sorting with SORT_FLAG_CASE use ASCII case
+    conversion.
+
 ========================================
 2. New Features
 ========================================
@@ -28,9 +36,10 @@ PHP 8.2 UPGRADE NOTES
     HTTP method in curl_getinfo() return value.
 
 - OCI8:
-  . Added an oci8.prefetch_lob_size directive to tune LOB query performance
-    by reducing the number of round-trips between PHP and Oracle Database when
-    fetching LOBS. This is usable with Oracle Database 12.2 or later.
+  . Added an oci8.prefetch_lob_size directive and oci_set_prefetch_lob()
+    function to tune LOB query performance by reducing the number of
+    round-trips between PHP and Oracle Database when fetching LOBS. This is
+    usable with Oracle Database 12.2 or later.
 
 - PCRE:
   . Added support for the "n" (NO_AUTO_CAPTURE) modifier, which makes simple
@@ -117,6 +126,14 @@ PHP 8.2 UPGRADE NOTES
 9. Other Changes to Extensions
 ========================================
 
+- OCI8:
+  . The minimum Oracle Client library version required is now 11.2.
+
+- Standard:
+  . getimagesize() now reports the actual image dimensions, bits and channels
+    of AVIF images. Previously, the dimensions have been reported as 0x0, and
+    bits and channels have not been reported at all.
+
 - Zip:
   . extension updated to 1.20.0 with new methods:
     ZipArchive::clearError, getStreamName and getStreamIndex
@@ -128,6 +145,9 @@ PHP 8.2 UPGRADE NOTES
 - COM_DOTNET:
   . LOCALE_NEUTRAL
 
+- Sockets:
+  . SO_INCOMING_CPU
+
 ========================================
 11. Changes to INI File Handling
 ========================================
@@ -140,6 +160,11 @@ PHP 8.2 UPGRADE NOTES
   . Windows specific error messages are no longer localized, but instead in
     English to better match PHP error messages.
 
+- OCI8:
+  . Since building against Oracle Client 10g is no longer supported anyway,
+    the configuration option --with-oci8 has been dropped. --with-oci8-11g,
+    --with-oci8-12c and --with-oci8-19 are still supported.
+
 ========================================
 13. Other Changes
 ========================================

UPGRADING.INTERNALS

@@ -6,6 +6,8 @@ PHP 8.2 INTERNALS UPGRADE NOTES
 
 3. Module changes
 
+4. OpCode changes
+
 ========================
 1. Internal API changes
 ========================
@@ -24,3 +26,14 @@ PHP 8.2 INTERNALS UPGRADE NOTES
 3. Module changes
 ========================
 
+========================
+4. OpCode changes
+========================
+
+* The ZEND_INIT_FCALL opcode now asserts that the function exists in the symbol
+  table as the function's existence is checked at compile time.
+  For extensions modifying the function symbol table, setting
+  CG(compiler_options) |= ZEND_COMPILE_IGNORE_USER_FUNCTIONS | ZEND_COMPILE_IGNORE_INTERNAL_FUNCTIONS;
+  will produce ZEND_INIT_FCALL_BY_NAME opcodes instead which check for the
+  existence of the function at runtime.
+

Zend/Optimizer/dce.c

@@ -620,7 +620,10 @@ int dce_optimize_op_array(zend_op_array *op_array, zend_ssa *ssa, bool reorder_d
 		while ((i = zend_bitset_pop_first(ctx.instr_worklist, ctx.instr_worklist_len)) >= 0) {
 			zend_bitset_excl(ctx.instr_dead, i);
 			add_operands_to_worklists(&ctx, &op_array->opcodes[i], &ssa->ops[i], ssa, 1);
-			if (i < op_array->last && op_array->opcodes[i+1].opcode == ZEND_OP_DATA) {
+			if (i < op_array->last
+			 && (op_array->opcodes[i+1].opcode == ZEND_OP_DATA
+			  || (op_array->opcodes[i].opcode == ZEND_NEW
+			   && op_array->opcodes[i+1].opcode == ZEND_DO_FCALL))) {
 				zend_bitset_excl(ctx.instr_dead, i+1);
 				add_operands_to_worklists(&ctx, &op_array->opcodes[i+1], &ssa->ops[i+1], ssa, 1);
 			}

Zend/Optimizer/dfa_pass.c

@@ -308,7 +308,7 @@ static inline bool can_elide_return_type_check(
 }
 
 static bool opline_supports_assign_contraction(
-		zend_ssa *ssa, zend_op *opline, int src_var, uint32_t cv_var) {
+		zend_op_array *op_array, zend_ssa *ssa, zend_op *opline, int src_var, uint32_t cv_var) {
 	if (opline->opcode == ZEND_NEW) {
 		/* see Zend/tests/generators/aborted_yield_during_new.phpt */
 		return 0;
@@ -342,6 +342,13 @@ static bool opline_supports_assign_contraction(
 		return opline->op1_type != IS_CV || opline->op1.var != cv_var;
 	}
 
+	if (opline->opcode == ZEND_ASSIGN_OP
+	 && opline->op1_type == IS_CV
+	 && opline->op1.var == cv_var
+	 && zend_may_throw(opline, &ssa->ops[ssa->vars[src_var].definition], op_array, ssa)) {
+		return 0;
+	}
+
 	return 1;
 }
 
@@ -716,9 +723,13 @@ static int zend_dfa_optimize_jmps(zend_op_array *op_array, zend_ssa *ssa)
 		uint32_t op_num;
 		zend_op *opline;
 		zend_ssa_op *ssa_op;
+		bool can_follow = 1;
 
 		while (next_block_num < ssa->cfg.blocks_count
 			&& !(ssa->cfg.blocks[next_block_num].flags & ZEND_BB_REACHABLE)) {
+			if (ssa->cfg.blocks[next_block_num].flags & ZEND_BB_UNREACHABLE_FREE) {
+				can_follow = 0;
+			}
 			next_block_num++;
 		}
 
@@ -730,7 +741,7 @@ static int zend_dfa_optimize_jmps(zend_op_array *op_array, zend_ssa *ssa)
 			switch (opline->opcode) {
 				case ZEND_JMP:
 optimize_jmp:
-					if (block->successors[0] == next_block_num) {
+					if (block->successors[0] == next_block_num && can_follow) {
 						MAKE_NOP(opline);
 						removed_ops++;
 						goto optimize_nop;
@@ -751,7 +762,7 @@ static int zend_dfa_optimize_jmps(zend_op_array *op_array, zend_ssa *ssa)
 							goto optimize_jmp;
 						}
 					} else {
-						if (block->successors[0] == next_block_num) {
+						if (block->successors[0] == next_block_num && can_follow) {
 							take_successor_0(ssa, block_num, block);
 							if (opline->op1_type == IS_CV && (OP1_INFO() & MAY_BE_UNDEF)) {
 								opline->opcode = ZEND_CHECK_VAR;
@@ -782,7 +793,7 @@ static int zend_dfa_optimize_jmps(zend_op_array *op_array, zend_ssa *ssa)
 							goto optimize_nop;
 						}
 					} else if (block->successors_count == 2) {
-						if (block->successors[0] == next_block_num) {
+						if (block->successors[0] == next_block_num && can_follow) {
 							take_successor_0(ssa, block_num, block);
 							if (opline->op1_type == IS_CV && (OP1_INFO() & MAY_BE_UNDEF)) {
 								opline->opcode = ZEND_CHECK_VAR;
@@ -816,7 +827,7 @@ static int zend_dfa_optimize_jmps(zend_op_array *op_array, zend_ssa *ssa)
 					} else if (block->successors_count == 2) {
 						if (block->successors[0] == block->successors[1]) {
 							take_successor_0(ssa, block_num, block);
-							if (block->successors[0] == next_block_num) {
+							if (block->successors[0] == next_block_num && can_follow) {
 								if (opline->op1_type == IS_CV && (OP1_INFO() & MAY_BE_UNDEF)) {
 									opline->opcode = ZEND_CHECK_VAR;
 									opline->op2.num = 0;
@@ -1327,7 +1338,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 				 && !ssa->vars[src_var].phi_use_chain
 				 && !ssa->vars[src_var].sym_use_chain
 				 && opline_supports_assign_contraction(
-					 ssa, &op_array->opcodes[ssa->vars[src_var].definition],
+					 op_array, ssa, &op_array->opcodes[ssa->vars[src_var].definition],
 					 src_var, opline->result.var)
 				 && !variable_defined_or_used_in_range(ssa, EX_VAR_TO_NUM(opline->result.var),
 						ssa->vars[src_var].definition+1, op_1)
@@ -1486,7 +1497,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 					 && !ssa->vars[src_var].phi_use_chain
 					 && !ssa->vars[src_var].sym_use_chain
 					 && opline_supports_assign_contraction(
-						 ssa, &op_array->opcodes[ssa->vars[src_var].definition],
+						 op_array, ssa, &op_array->opcodes[ssa->vars[src_var].definition],
 						 src_var, opline->op1.var)
 					 && !variable_defined_or_used_in_range(ssa, EX_VAR_TO_NUM(opline->op1.var),
 							ssa->vars[src_var].definition+1, op_1)

Zend/Optimizer/pass1.c

@@ -103,33 +103,9 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 			break;
 
 		case ZEND_ASSIGN_OP:
-			if (opline->op2_type == IS_CONST) {
-				if (opline->extended_value == ZEND_ADD
-				 || opline->extended_value == ZEND_SUB
-				 || opline->extended_value == ZEND_MUL
-				 || opline->extended_value == ZEND_DIV
-				 || opline->extended_value == ZEND_POW) {
-					if (Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING) {
-						/* don't optimize if it should produce a runtime numeric string error */
-						if (is_numeric_string(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)), NULL, NULL, 0)) {
-							convert_scalar_to_number(&ZEND_OP2_LITERAL(opline));
-						}
-					}
-				} else if (opline->extended_value == ZEND_MOD
-				 || opline->extended_value == ZEND_SL
-				 || opline->extended_value == ZEND_SR) {
-					zval *op2 = &ZEND_OP2_LITERAL(opline);
-					if (Z_TYPE_P(op2) != IS_LONG) {
-						if (!zend_is_op_long_compatible(op2)) {
-							break;
-						}
-						convert_to_long(op2);
-					}
-				} else if (opline->extended_value == ZEND_CONCAT) {
-					if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_STRING) {
-						convert_to_string(&ZEND_OP2_LITERAL(opline));
-					}
-				}
+			if (opline->extended_value == ZEND_CONCAT && opline->op2_type == IS_CONST
+					&& Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_STRING) {
+				convert_to_string(&ZEND_OP2_LITERAL(opline));
 			}
 			break;
 

Zend/Optimizer/sccp.c

@@ -799,59 +799,21 @@ static inline zend_result ct_eval_array_key_exists(zval *result, zval *op1, zval
 	return SUCCESS;
 }
 
-static bool can_ct_eval_func_call(zend_string *name, uint32_t num_args, zval **args) {
-	/* Functions in this list must always produce the same result for the same arguments,
+static bool can_ct_eval_func_call(zend_function *func, zend_string *name, uint32_t num_args, zval **args) {
+	/* Precondition: func->type == ZEND_INTERNAL_FUNCTION, this is a global function */
+	/* Functions setting ZEND_ACC_COMPILE_TIME_EVAL (@compile-time-eval) must always produce the same result for the same arguments,
 	 * and have no dependence on global state (such as locales). It is okay if they throw
 	 * or warn on invalid arguments, as we detect this and will discard the evaluation result. */
-	if (false
-		|| zend_string_equals_literal(name, "array_diff")
-		|| zend_string_equals_literal(name, "array_diff_assoc")
-		|| zend_string_equals_literal(name, "array_diff_key")
-		|| zend_string_equals_literal(name, "array_flip")
-		|| zend_string_equals_literal(name, "array_is_list")
-		|| zend_string_equals_literal(name, "array_key_exists")
-		|| zend_string_equals_literal(name, "array_keys")
-		|| zend_string_equals_literal(name, "array_merge")
-		|| zend_string_equals_literal(name, "array_merge_recursive")
-		|| zend_string_equals_literal(name, "array_replace")
-		|| zend_string_equals_literal(name, "array_replace_recursive")
-		|| zend_string_equals_literal(name, "array_unique")
-		|| zend_string_equals_literal(name, "array_values")
-		|| zend_string_equals_literal(name, "base64_decode")
-		|| zend_string_equals_literal(name, "base64_encode")
+	if (func->common.fn_flags & ZEND_ACC_COMPILE_TIME_EVAL) {
+		/* This has @compile-time-eval in stub info and uses a macro such as ZEND_SUPPORTS_COMPILE_TIME_EVAL_FE */
+		return true;
+	}
 #ifndef ZEND_WIN32
-		/* On Windows this function may be code page dependent. */
-		|| zend_string_equals_literal(name, "dirname")
-#endif
-		|| zend_string_equals_literal(name, "explode")
-		|| zend_string_equals_literal(name, "imagetypes")
-		|| zend_string_equals_literal(name, "in_array")
-		|| zend_string_equals_literal(name, "implode")
-		|| zend_string_equals_literal(name, "ltrim")
-		|| zend_string_equals_literal(name, "php_sapi_name")
-		|| zend_string_equals_literal(name, "php_uname")
-		|| zend_string_equals_literal(name, "phpversion")
-		|| zend_string_equals_literal(name, "pow")
-		|| zend_string_equals_literal(name, "preg_quote")
-		|| zend_string_equals_literal(name, "rawurldecode")
-		|| zend_string_equals_literal(name, "rawurlencode")
-		|| zend_string_equals_literal(name, "rtrim")
-		|| zend_string_equals_literal(name, "serialize")
-		|| zend_string_equals_literal(name, "str_contains")
-		|| zend_string_equals_literal(name, "str_ends_with")
-		|| zend_string_equals_literal(name, "str_replace")
-		|| zend_string_equals_literal(name, "str_split")
-		|| zend_string_equals_literal(name, "str_starts_with")
-		|| zend_string_equals_literal(name, "strpos")
-		|| zend_string_equals_literal(name, "strstr")
-		|| zend_string_equals_literal(name, "substr")
-		|| zend_string_equals_literal(name, "trim")
-		|| zend_string_equals_literal(name, "urldecode")
-		|| zend_string_equals_literal(name, "urlencode")
-		|| zend_string_equals_literal(name, "version_compare")
-	) {
+	/* On Windows this function may be code page dependent. */
+	if (zend_string_equals_literal(name, "dirname")) {
 		return true;
 	}
+#endif
 
 	if (num_args == 2) {
 		if (zend_string_equals_literal(name, "str_repeat")) {
@@ -918,7 +880,7 @@ static inline zend_result ct_eval_func_call(
 		}
 	}
 
-	if (!can_ct_eval_func_call(name, num_args, args)) {
+	if (!can_ct_eval_func_call(func, name, num_args, args)) {
 		return FAILURE;
 	}
 
@@ -2244,6 +2206,17 @@ static int try_remove_definition(sccp_ctx *ctx, int var_num, zend_ssa_var *var,
 				zend_ssa_remove_result_def(ssa, ssa_op);
 				if (opline->opcode == ZEND_DO_ICALL) {
 					removed_ops = remove_call(ctx, opline, ssa_op);
+				} else if (opline->opcode == ZEND_TYPE_CHECK
+						&& (opline->op1_type & (IS_VAR|IS_TMP_VAR))
+						&& (!value_known(&ctx->values[ssa_op->op1_use])
+							|| IS_PARTIAL_ARRAY(&ctx->values[ssa_op->op1_use])
+							|| IS_PARTIAL_OBJECT(&ctx->values[ssa_op->op1_use]))) {
+					/* For TYPE_CHECK we may compute the result value without knowing the
+					 * operand, based on type inference information. Make sure the operand is
+					 * freed and leave further cleanup to DCE. */
+					opline->opcode = ZEND_FREE;
+					opline->result_type = IS_UNUSED;
+					removed_ops++;
 				} else {
 					zend_ssa_remove_instr(ssa, opline, ssa_op);
 					removed_ops++;

Zend/Optimizer/zend_func_infos.h

@@ -171,9 +171,9 @@ static const func_info_t func_infos[] = {
     F1("gmp_sqrtrem", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_OBJECT),
     F1("gmp_rootrem", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_OBJECT),
     F1("gmp_gcdext", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_OBJECT),
-    F1("hash", MAY_BE_STRING|MAY_BE_FALSE),
+    F1("hash", MAY_BE_STRING),
     F1("hash_file", MAY_BE_STRING|MAY_BE_FALSE),
-    F1("hash_hmac", MAY_BE_STRING|MAY_BE_FALSE),
+    F1("hash_hmac", MAY_BE_STRING),
     F1("hash_hmac_file", MAY_BE_STRING|MAY_BE_FALSE),
     F1("hash_init", MAY_BE_OBJECT),
     F1("hash_final", MAY_BE_STRING),