Merge branch 'PHP-7.3' into PHP-7.4

twose · twose · commit 7a39e174aa82 · 2020-07-11T18:31:30.000+08:00
* PHP-7.3:
  Fixed BC break of php_debug_zval_dump
diff --git a/ext/standard/var.c b/ext/standard/var.c
@@ -327,7 +327,7 @@ PHPAPI void php_debug_zval_dump(zval *struc, int level) /* {{{ */
 			GC_ADDREF(myht);
 		}
 		count = zend_array_count(myht);
-		php_printf("%sarray(%d) refcount(%u){\n", COMMON, count, Z_REFCOUNTED_P(struc) ? Z_REFCOUNT_P(struc) : 1);
+		php_printf("%sarray(%d) refcount(%u){\n", COMMON, count, Z_REFCOUNTED_P(struc) ? Z_REFCOUNT_P(struc) - 1 : 1);
 		ZEND_HASH_FOREACH_KEY_VAL_IND(myht, index, key, val) {
 			zval_array_element_dump(val, index, key, level);
 		} ZEND_HASH_FOREACH_END();

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ PHPAPI void php_debug_zval_dump(zval struc, int level) / {{{ */`
`327`	`327`	`GC_ADDREF(myht);`
`328`	`328`	`}`
`329`	`329`	`count = zend_array_count(myht);`
`330`		`- php_printf("%sarray(%d) refcount(%u){\n", COMMON, count, Z_REFCOUNTED_P(struc) ? Z_REFCOUNT_P(struc) : 1);`
	`330`	`+ php_printf("%sarray(%d) refcount(%u){\n", COMMON, count, Z_REFCOUNTED_P(struc) ? Z_REFCOUNT_P(struc) - 1 : 1);`
`331`	`331`	`ZEND_HASH_FOREACH_KEY_VAL_IND(myht, index, key, val) {`
`332`	`332`	`zval_array_element_dump(val, index, key, level);`
`333`	`333`	`} ZEND_HASH_FOREACH_END();`