Merge branch 'PHP-8.1' into PHP-8.2

iluuu1994 · iluuu1994 · commit d016c49cf5d4 · 2023-08-17T18:55:45.000+02:00
* PHP-8.1:
  Remove redundant condition
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -1438,7 +1438,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
`@@ -1438,7 +1438,7 @@ static bool array_is_const_ex(zend_array array, uint32_t max_checks)`
`1438`	`1438`	`if (!array_is_const_ex(array, max_checks)) {`
`1439`	`1439`	`return false;`
`1440`	`1440`	`}`
`1441`		`- } else if (UNEXPECTED(Z_TYPE_P(element) >=IS_OBJECT)) {`
	`1441`	`+ } else {`
`1442`	`1442`	`return false;`
`1443`	`1443`	`}`
`1444`	`1444`	`} ZEND_HASH_FOREACH_END();`