Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix nightly failure in test variation due to number of temp variables varying when observers are enabled

Author: nielsdos

ext/opcache/tests/opt/gh11170.phpt

@@ -39,7 +39,7 @@ test_and();
 ?>
 --EXPECTF--
 $_main:
-     ; (lines=5, args=0, vars=0, tmps=2, ssa_vars=0, no_loops)
+     ; (lines=5, args=0, vars=0, tmps=%d, ssa_vars=0, no_loops)
      ; (after dfa pass)
      ; %s
      ; return  [long] RANGE[1..1]
@@ -53,7 +53,7 @@ BB0:
 0004 RETURN int(1)
 
 test_or:
-     ; (lines=11, args=0, vars=2, tmps=7, ssa_vars=11, no_loops)
+     ; (lines=11, args=0, vars=2, tmps=%d, ssa_vars=11, no_loops)
      ; (after dfa pass)
      ; %s
      ; return  [long] RANGE[-20..-1]
@@ -99,7 +99,7 @@ BB3:
 0010 RETURN #10.T8 [long] RANGE[-20..-1]
 
 test_and:
-     ; (lines=11, args=0, vars=2, tmps=7, ssa_vars=11, no_loops)
+     ; (lines=11, args=0, vars=2, tmps=%d, ssa_vars=11, no_loops)
      ; (after dfa pass)
      ; %s
      ; return  [long] RANGE[-28..-25]

ext/opcache/tests/opt/nullsafe_002.phpt

@@ -20,7 +20,7 @@ function test(?Test $test) {
 ?>
 --EXPECTF--
 $_main:
-     ; (lines=1, args=0, vars=0, tmps=0, ssa_vars=0, no_loops)
+     ; (lines=1, args=0, vars=0, tmps=%d, ssa_vars=0, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  [long] RANGE[1..1]
@@ -30,7 +30,7 @@ BB0:
 0000 RETURN int(1)
 
 test:
-     ; (lines=7, args=1, vars=1, tmps=2, ssa_vars=6, no_loops)
+     ; (lines=7, args=1, vars=1, tmps=%d, ssa_vars=6, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  [null] RANGE[0..0]

ext/opcache/tests/opt/prop_types.phpt

@@ -40,7 +40,7 @@ function noScope(Test $test) {
 ?>
 --EXPECTF--
 $_main:
-     ; (lines=1, args=0, vars=0, tmps=0, ssa_vars=0, no_loops)
+     ; (lines=1, args=0, vars=0, tmps=%d, ssa_vars=0, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  [long] RANGE[1..1]
@@ -50,7 +50,7 @@ BB0:
 0000 RETURN int(1)
 
 noScope:
-     ; (lines=10, args=1, vars=1, tmps=4, ssa_vars=5, no_loops)
+     ; (lines=10, args=1, vars=1, tmps=%d, ssa_vars=5, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  [null] RANGE[0..0]
@@ -70,7 +70,7 @@ BB0:
 0009 RETURN null
 
 Test::inTest:
-     ; (lines=9, args=0, vars=0, tmps=4, ssa_vars=3, no_loops)
+     ; (lines=9, args=0, vars=0, tmps=%d, ssa_vars=3, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  [null] RANGE[0..0]
@@ -88,7 +88,7 @@ BB0:
 0008 RETURN null
 
 Test::inTestWithTest2:
-     ; (lines=10, args=1, vars=1, tmps=4, ssa_vars=5, no_loops)
+     ; (lines=10, args=1, vars=1, tmps=%d, ssa_vars=5, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  [null] RANGE[0..0]
@@ -108,7 +108,7 @@ BB0:
 0009 RETURN null
 
 Test2::inTest2:
-     ; (lines=9, args=0, vars=0, tmps=4, ssa_vars=3, no_loops)
+     ; (lines=9, args=0, vars=0, tmps=%d, ssa_vars=3, no_loops)
      ; (before dfa pass)
      ; %s
      ; return  [null] RANGE[0..0]