Merge branch 'master' into packed_ht

* master: (378 commits)
  Removed debug code.
  JIT: Fixed use after free introduced in 92ad90a
  Inline "helper" macros
  Use zend_result as return value for DBA handler
  JIT: Avoid ZEND_CALL_RELEASE_THIS checks
  JIT_G(current_frame)->stacj is always true.
  JIT: Avoid dead type store
  [ci skip] Fix NEWS
  Fix #76167: mbstring may use pointer from some previous request
  Tracing JIT: Fixed possible endless loop when escape from ZEND_CALL_TOP frame
  Remove tests for obsolete Oracle DB version
  Remove test for obsolete Oracle DB version
  Fix tests for method camel case change
  Fix tests for method camel case change
  DBA should not convert elements in-place if the key param is an array
  Fix DBA on MacOS (php#7611)
  Refactor DBA
  Drop confusing ac local variable for ZEND_NUM_ARGS()
  Inline DBA_GET2 macro
  Inline DBA_ID_PARS macro
  ...

Author: dstogov

NEWS

@@ -2,4 +2,15 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.2.0alpha1
 
+- CLI:
+  . Fixed bug #81496 (Server logs incorrect request method). (lauri)
+
+- Core:
+  . Fixed bug #81380 (Observer may not be initialized properly). (krakjoe)
+
+- Zip:
+  . add ZipArchive::clearError() method
+  . add ZipArchive::getStreamName() method
+  . add ZipArchive::getStreamIndex() method
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

README.md

@@ -135,7 +135,7 @@ contribute:
 
 - [Contributing to PHP](/CONTRIBUTING.md)
 - [PHP coding standards](/CODING_STANDARDS.md)
-- [Mailinglist rules](/docs/mailinglist-rules.md)
+- [Mailing list rules](/docs/mailinglist-rules.md)
 - [PHP release process](/docs/release-process.md)
 
 ## Credits

UPGRADING

@@ -23,6 +23,10 @@ PHP 8.2 UPGRADE NOTES
 2. New Features
 ========================================
 
+- Curl:
+  . Added CURLINFO_EFFECTIVE_METHOD option and returning the effective
+    HTTP method in curl_getinfo() return value.
+
 ========================================
 3. Changes in SAPI modules
 ========================================
@@ -31,10 +35,38 @@ PHP 8.2 UPGRADE NOTES
 4. Deprecated Functionality
 ========================================
 
+- Core:
+  . Callables that are not accepted by the $callable() syntax (but are accepted
+    by call_user_func) are deprecated. In particular:
+
+        "self::method"
+        "parent::method"
+        "static::method"
+        ["self", "method"]
+        ["parent", "method"]
+        ["static", "method"]
+        ["Foo", "Bar::method"]
+        [new Foo, "Bar::method"]
+
+    This does not affect normal method callables like "A::method" or
+    ["A", "method"]. A deprecation notice is only emitted on call. Both
+    is_callable() and the callable type will silently accept these callables
+    until support for them is removed entirely.
+
+    RFC: https://wiki.php.net/rfc/deprecate_partially_supported_callables
+
 ========================================
 5. Changed Functions
 ========================================
 
+- DBA
+  . dba_fetch()'s optional skip argument is now at the end in line with
+    PHP userland semantics its signature now is:
+    dba_fetch(string|array $key, $dba, int $skip = 0): string|false
+    The overloaded signature
+    dba_fetch(string|array $key, $skip, $dba): string|false
+    is still accepted, but it is recommended to use the new standard variant.
+
 ========================================
 6. New Functions
 ========================================
@@ -51,6 +83,10 @@ PHP 8.2 UPGRADE NOTES
 9. Other Changes to Extensions
 ========================================
 
+- Zip:
+  . extension updated to 1.20.0 with new methods:
+    ZipArchive::cleaError, getStreamName and getStreamIndex
+
 ========================================
 10. New Global Constants
 ========================================

UPGRADING.INTERNALS

@@ -10,6 +10,12 @@ PHP 8.2 INTERNALS UPGRADE NOTES
 1. Internal API changes
 ========================
 
+* Removed zend_binary_zval_str(n)casecmp() APIs. These were thin wrappers
+  around zend_binary_str(n)casecmp_l() -- rather than
+  zend_binary_str(n)casecmp() as one would expect. Call the appropriate
+  wrapped function directly instead.
+* Removed the (ZEND_)WRONG_PARAM_COUNT_WITH_RETVAL() macros.
+
 ========================
 2. Build system changes
 ========================

Zend/Optimizer/block_pass.c

@@ -30,7 +30,7 @@
 #include "zend_dump.h"
 
 /* Checks if a constant (like "true") may be replaced by its value */
-int zend_optimizer_get_persistent_constant(zend_string *name, zval *result, int copy)
+bool zend_optimizer_get_persistent_constant(zend_string *name, zval *result, int copy)
 {
 	zend_constant *c = zend_hash_find_ptr(EG(zend_constants), name);
 	if (c) {
@@ -220,7 +220,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 						 * Float to string conversion may be affected by current
 						 * locale setting.
 						 */
-						int l, old_len;
+						size_t l, old_len;
 
 						if (Z_TYPE(ZEND_OP1_LITERAL(opline)) != IS_STRING) {
 							convert_to_string(&ZEND_OP1_LITERAL(opline));
@@ -327,7 +327,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 			   ) {
 				zval *arg = &OPLINE_OP1_LITERAL(sv);
 				char *fname = FUNCTION_CACHE->funcs[Z_LVAL(ZEND_OP1_LITERAL(fcall))].function_name;
-				int flen = FUNCTION_CACHE->funcs[Z_LVAL(ZEND_OP1_LITERAL(fcall))].name_len;
+				size_t flen = FUNCTION_CACHE->funcs[Z_LVAL(ZEND_OP1_LITERAL(fcall))].name_len;
 				if((flen == sizeof("function_exists")-1 && zend_binary_strcasecmp(fname, flen, "function_exists", sizeof("function_exists")-1) == 0) ||
 						  (flen == sizeof("is_callable")-1 && zend_binary_strcasecmp(fname, flen, "is_callable", sizeof("is_callable")-1) == 0)
 						  ) {
@@ -341,7 +341,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 					}
 				} else if(flen == sizeof("constant")-1 && zend_binary_strcasecmp(fname, flen, "constant", sizeof("constant")-1) == 0) {
 					zval c;
-					if(zend_optimizer_get_persistent_constant(Z_STR_P(arg), &c, 1 ELS_CC) != 0) {
+					if (zend_optimizer_get_persistent_constant(Z_STR_P(arg), &c, 1 ELS_CC)) {
 						literal_dtor(arg);
 						MAKE_NOP(sv);
 						MAKE_NOP(fcall);
@@ -712,7 +712,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 					     src->opcode == ZEND_FAST_CONCAT) &&
 					    src->op2_type == IS_CONST) {
 						/* compress consecutive CONCATs */
-						int l, old_len;
+						size_t l, old_len;
 
 						if (Z_TYPE(ZEND_OP2_LITERAL(opline)) != IS_STRING) {
 							convert_to_string(&ZEND_OP2_LITERAL(opline));
@@ -960,7 +960,6 @@ static void assemble_code_blocks(zend_cfg *cfg, zend_op_array *op_array, zend_op
 	zend_op *new_opcodes;
 	zend_op *opline;
 	uint32_t len = 0;
-	int n;
 
 	for (b = blocks; b < end; b++) {
 		if (b->len == 0) {
@@ -1120,16 +1119,9 @@ static void assemble_code_blocks(zend_cfg *cfg, zend_op_array *op_array, zend_op
 		free_alloca(map, use_heap);
 	}
 
-	/* adjust early binding list */
-	if (op_array->fn_flags & ZEND_ACC_EARLY_BINDING) {
-		ZEND_ASSERT(op_array == &ctx->script->main_op_array);
-		ctx->script->first_early_binding_opline =
-			zend_build_delayed_early_binding_list(op_array);
-	}
-
 	/* rebuild map (just for printing) */
 	memset(cfg->map, -1, sizeof(int) * op_array->last);
-	for (n = 0; n < cfg->blocks_count; n++) {
+	for (int n = 0; n < cfg->blocks_count; n++) {
 		if (cfg->blocks[n].flags & (ZEND_BB_REACHABLE|ZEND_BB_UNREACHABLE_FREE)) {
 			cfg->map[cfg->blocks[n].start] = n;
 		}
@@ -1189,7 +1181,7 @@ static zend_always_inline zend_basic_block *get_next_block(const zend_cfg *cfg,
 
 
 /* we use "jmp_hitlist" to avoid infinity loops during jmp optimization */
-static zend_always_inline int in_hitlist(int target, int *jmp_hitlist, int jmp_hitlist_count)
+static zend_always_inline bool in_hitlist(int target, int *jmp_hitlist, int jmp_hitlist_count)
 {
 	int i;
 
@@ -1642,7 +1634,7 @@ static void zend_t_usage(zend_cfg *cfg, zend_op_array *op_array, zend_bitset use
 	}
 
 	if (ctx->debug_level & ZEND_DUMP_BLOCK_PASS_VARS) {
-		int printed = 0;
+		bool printed = 0;
 		uint32_t i;
 
 		for (i = op_array->last_var; i< op_array->T; i++) {
@@ -1848,10 +1840,7 @@ void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 
     /* Build CFG */
 	checkpoint = zend_arena_checkpoint(ctx->arena);
-	if (zend_build_cfg(&ctx->arena, op_array, 0, &cfg) != SUCCESS) {
-		zend_arena_release(&ctx->arena, checkpoint);
-		return;
-	}
+	zend_build_cfg(&ctx->arena, op_array, 0, &cfg);
 
 	if (cfg.blocks_count * (op_array->last_var + op_array->T) > 64 * 1024 * 1024) {
 		zend_arena_release(&ctx->arena, checkpoint);
@@ -1892,6 +1881,15 @@ void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 
 		/* Eliminate NOPs */
 		for (b = blocks; b < end; b++) {
+			if (b->flags & ZEND_BB_UNREACHABLE_FREE) {
+				/* In unreachable_free blocks only preserve loop var frees. */
+				for (uint32_t i = b->start; i < b->start + b->len; i++) {
+					zend_op *opline = &op_array->opcodes[i];
+					if (!zend_optimizer_is_loop_var_free(opline)) {
+						MAKE_NOP(opline);
+					}
+				}
+			}
 			if (b->flags & (ZEND_BB_REACHABLE|ZEND_BB_UNREACHABLE_FREE)) {
 				strip_nops(op_array, b);
 			}

Zend/Optimizer/compact_literals.c

@@ -88,7 +88,7 @@ static uint32_t add_static_slot(HashTable     *hash,
                                 uint32_t       op1,
                                 uint32_t       op2,
                                 uint32_t       kind,
-                                int           *cache_size)
+                                uint32_t       *cache_size)
 {
 	uint32_t ret;
 	zval *class_name = &op_array->literals[op1];
@@ -150,7 +150,8 @@ static zend_string *create_str_cache_key(zval *literal, uint32_t flags)
 void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 {
 	zend_op *opline, *end;
-	int i, j, n, *map, cache_size;
+	int i, j, n, *map;
+	uint32_t cache_size;
 	zval zv, *pos;
 	literal_info *info;
 	int l_null = -1;

Zend/Optimizer/dce.c

@@ -363,9 +363,7 @@ static bool try_remove_var_def(context *ctx, int free_var, int use_chain, zend_o
 				case ZEND_PRE_INC:
 				case ZEND_PRE_DEC:
 				case ZEND_PRE_INC_OBJ:
-				case ZEND_POST_INC_OBJ:
 				case ZEND_PRE_DEC_OBJ:
-				case ZEND_POST_DEC_OBJ:
 				case ZEND_DO_ICALL:
 				case ZEND_DO_UCALL:
 				case ZEND_DO_FCALL_BY_NAME:
@@ -464,13 +462,19 @@ static inline int get_common_phi_source(zend_ssa *ssa, zend_ssa_phi *phi) {
 	int common_source = -1;
 	int source;
 	FOREACH_PHI_SOURCE(phi, source) {
+		if (source == phi->ssa_var) {
+			continue;
+		}
 		if (common_source == -1) {
 			common_source = source;
-		} else if (common_source != source && source != phi->ssa_var) {
+		} else if (common_source != source) {
 			return -1;
 		}
 	} FOREACH_PHI_SOURCE_END();
-	ZEND_ASSERT(common_source != -1);
+
+	/* If all sources are phi->ssa_var this phi must be in an unreachable cycle.
+	 * We can't easily drop the phi in that case, as we don't have something to replace it with.
+	 * Ideally SCCP would eliminate the whole cycle. */
 	return common_source;
 }