Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
  ext/intl: change when the locale is invalid for the 8.1/8.2 serie.

Author: dstogov

NEWS

@@ -28,6 +28,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-12232 (FPM: segfault dynamically loading extension without
     opcache). (Jakub Zelenka)
 
+- Intl:
+  . Removed the BC break on IntlDateFormatter::construct which threw an
+    exception with an invalid locale. (David Carlier)
+
 - Opcache:
   . Added warning when JIT cannot be enabled. (danog)
   . Fixed bug GH-8143 (Crashes in zend_accel_inheritance_cache_find since

Zend/Optimizer/zend_inference.c

@@ -2545,6 +2545,7 @@ static zend_always_inline zend_result _zend_update_type_info(
 	 * code may assume that operands have at least one type. */
 	if (!(t1 & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_CLASS))
 	 || !(t2 & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_CLASS))
+	 || (ssa_op->result_use >= 0 && !(RES_USE_INFO() & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_CLASS)))
 	 || ((opline->opcode == ZEND_ASSIGN_DIM_OP
 	   || opline->opcode == ZEND_ASSIGN_OBJ_OP
 	   || opline->opcode == ZEND_ASSIGN_STATIC_PROP_OP

ext/intl/dateformat/dateformat_create.cpp

@@ -113,8 +113,7 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_error_handlin
 	locale = Locale::createFromName(locale_str);
 	/* get*Name accessors being set does not preclude being bogus */
 	if (locale.isBogus() || strlen(locale.getISO3Language()) == 0) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: invalid locale", 0);
-		return FAILURE;
+		goto error;
 	}
 
 	/* process calendar */

ext/intl/tests/gh12282.phpt

@@ -5,17 +5,18 @@ intl
 --FILE--
 <?php
 
-try {
-    new IntlDateFormatter(
+var_dump(new IntlDateFormatter(
 	'xx',
 	IntlDateFormatter::FULL,
 	IntlDateFormatter::FULL,
 	null,
 	null,
 	'w'
-    );
-} catch (\IntlException $e) {
-    echo $e->getMessage();
-}
+));
+Locale::setDefault('xx');
+var_dump(new IntlDateFormatter(Locale::getDefault()));
 --EXPECT--
-datefmt_create: invalid locale: U_ILLEGAL_ARGUMENT_ERROR
+object(IntlDateFormatter)#1 (0) {
+}
+object(IntlDateFormatter)#1 (0) {
+}

ext/opcache/tests/opt/gh10008.phpt

@@ -0,0 +1,26 @@
+--TEST--
+GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+--EXTENSIONS--
+opcache
+--FILE--
+<?php
+function test()
+{
+    $bool_or_int = true;
+    while (a()) {
+        if ($bool_or_int !== true) {
+            // The following line triggers narrowing during type inference of ZEND_ADD_ARRAY_ELEMENT.
+            $string_key = "a";
+            $array = ["bool_or_int" => $bool_or_int, $string_key => 123];
+        }
+
+        $bool_or_int = 0;
+    }
+}
+?>
+DONE
+--EXPECT--
+DONE