Merge branch 'PHP-8.2'

iluuu1994 · iluuu1994 · commit 1b9ff16f9281 · 2023-08-17T18:55:51.000+02:00
* PHP-8.2:
  Remove redundant condition
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -1568,7 +1568,7 @@ static bool array_is_const_ex(zend_array *array, uint32_t *max_checks)
 			if (!array_is_const_ex(array, max_checks)) {
 				return false;
 			}
-		} else if (UNEXPECTED(Z_TYPE_P(element) >=IS_OBJECT)) {
+		} else {
 			return false;
 		}
 	} ZEND_HASH_FOREACH_END();

Original file line number	Diff line number	Diff line change
`@@ -1568,7 +1568,7 @@ static bool array_is_const_ex(zend_array array, uint32_t max_checks)`
`1568`	`1568`	`if (!array_is_const_ex(array, max_checks)) {`
`1569`	`1569`	`return false;`
`1570`	`1570`	`}`
`1571`		`- } else if (UNEXPECTED(Z_TYPE_P(element) >=IS_OBJECT)) {`
	`1571`	`+ } else {`
`1572`	`1572`	`return false;`
`1573`	`1573`	`}`
`1574`	`1574`	`} ZEND_HASH_FOREACH_END();`