Girgias · Girgias · Jan 25, 2024 · Jan 31, 2024 · Feb 19, 2024 · Feb 20, 2024
diff --git a/Zend/tests/bug31683.phpt b/Zend/tests/bug31683.phpt
@@ -77,6 +77,7 @@ string(2) "ok"
 string(2) "ok"
 string(2) "ok"
 string(2) "ok"
+string(2) "ok"
 NULL
 string(2) "ok"
 string(2) "ok"
@@ -90,6 +91,7 @@ string(2) "ok"
 string(2) "ok"
 string(2) "ok"
 string(2) "ok"
+string(2) "ok"
 NULL
 string(2) "ok"
 string(2) "ok"

diff --git a/Zend/tests/bug63217.phpt b/Zend/tests/bug63217.phpt
@@ -91,15 +91,19 @@ var_dump($ao);
 ?>
 --EXPECT--
 offsetExists given string(1) "0"
+offsetGet given string(1) "0"
 offsetExists given string(3) "123"
+offsetGet given string(3) "123"
 offsetUnset given string(1) "0"
 offsetUnset given string(3) "123"
 offsetSet given string(1) "0"
 offsetSet given string(3) "123"
 offsetGet given string(1) "0"
 offsetGet given string(3) "123"
 offsetExists given string(1) "0"
+offsetGet given string(1) "0"
 offsetExists given string(3) "123"
+offsetGet given string(3) "123"
 offsetUnset given string(1) "0"
 offsetUnset given string(3) "123"
 offsetSet given string(1) "0"

diff --git a/Zend/tests/bug69955.phpt b/Zend/tests/bug69955.phpt
@@ -26,10 +26,12 @@ $c10 = new C10;
 
 var_dump($c10[] += 5);
 ?>
---EXPECT--
+--EXPECTF--
 Inside C10::offsetGet
 NULL
 
+Notice: Indirect modification of overloaded element of C10 has no effect in %s on line %d
+
 Inside C10::offsetSet
 NULL
 int(105)

diff --git a/Zend/tests/bug75420.10.phpt b/Zend/tests/bug75420.10.phpt
@@ -16,6 +16,6 @@ var_dump($obj[$name] ?? 12);
 var_dump($name);
 ?>
 --EXPECT--
-string(6) "foofoo"
+int(24)
 int(42)
 int(24)
diff --git a/Zend/tests/bug75420.11.phpt b/Zend/tests/bug75420.11.phpt
@@ -15,6 +15,6 @@ var_dump(empty($obj[$name]));
 var_dump($name);
 ?>
 --EXPECT--
-string(3) "foo"
+int(24)
 bool(false)
 int(24)
diff --git a/Zend/tests/bug75420.12.phpt b/Zend/tests/bug75420.12.phpt
@@ -16,6 +16,6 @@ var_dump(empty($obj[$name]));
 var_dump($name);
 ?>
 --EXPECT--
-string(6) "foofoo"
+int(24)
 bool(false)
 int(24)
diff --git a/Zend/tests/bug75420.17.phpt b/Zend/tests/bug75420.17.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #75420.17 (Indirect modification of magic method argument)
+--FILE--
+<?php
+class Test implements ArrayAccess {
+    public function offsetExists($x): bool { $GLOBALS["obj"] = 24; return true; }
+    public function offsetGet($x): mixed { var_dump($x); return 42; }
+    public function offsetSet($x, $y): void { }
+    public function offsetUnset($x): void { }
+}
+
+$obj = new Test;
+$name = "foo";
+var_dump(isset($obj[$name]));
+var_dump($obj);
+?>
+--EXPECT--
+string(3) "foo"
+bool(true)
+int(24)
diff --git a/Zend/tests/bug75420.9.phpt b/Zend/tests/bug75420.9.phpt
@@ -15,6 +15,6 @@ var_dump($obj[$name] ?? 12);
 var_dump($name);
 ?>
 --EXPECT--
-string(3) "foo"
+int(24)
 int(42)
 int(24)
diff --git a/Zend/tests/new_without_parentheses/new_with_ctor_arguments_parentheses.phpt b/Zend/tests/new_without_parentheses/new_with_ctor_arguments_parentheses.phpt
@@ -107,5 +107,8 @@ offsetGet
 offsetGet
 offsetGet
 offsetExists
+offsetGet
 offsetExists
+offsetGet
 offsetExists
+offsetGet
diff --git a/Zend/tests/offsets/ArrayAccess_container_offset_behaviour.phpt b/Zend/tests/offsets/ArrayAccess_container_offset_behaviour.phpt
@@ -27,6 +27,8 @@ int(25)
 isset():
 string(15) "CLASS_NAME::offsetExists"
 VAR_DUMP_OF_OFFSET
+string(12) "CLASS_NAME::offsetGet"
+VAR_DUMP_OF_OFFSET
 bool(true)
 empty():
 string(15) "CLASS_NAME::offsetExists"
@@ -100,7 +102,7 @@ Cannot unset offset in a non-array variable
 OUTPUT;
 
 ob_start();
-foreach (['A', 'B'] as $class) {
+foreach (['A'] as $class) {
     foreach ($offsets as $dimension) {
         $container = new $class();
         $error = "(new $class())[" . zend_test_var_export($dimension) . '] has different outputs' . "\n";

diff --git a/Zend/tests/offsets/ArrayObject_container_offset_behaviour.phpt b/Zend/tests/offsets/ArrayObject_container_offset_behaviour.phpt
@@ -41,6 +41,7 @@ bool(false)
 Nested null coalesce:
 int(30)
 Nested unset():
+
 OUTPUT;
 
 $EXPECTED_OUTPUT_VALID_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTED_OUTPUT_VALID_OFFSETS) . '$/s';
@@ -58,27 +59,33 @@ Deprecated: Implicit conversion from float %F to int loses precision in %s on li
 Read:
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
-int(15)
+int(5)
 Read-Write:
 
+Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
+
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 isset():
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 bool(true)
 empty():
 
+Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
+
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 bool(false)
 null coalesce:
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
-int(35)
+
+Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
+int(25)
 Reference to dimension:
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 Value of reference:
-int(35)
+int(25)
 Value of container dimension after write to reference (should be int(100) if successful):
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
@@ -90,9 +97,9 @@ Nested read:
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 
-Warning: Undefined array key 0 in %s on line %d
+Warning: Undefined array key %s in %s on line %d
 
-Warning: Trying to access array offset on null in %s on line %d
+Warning: Trying to access array offset on null in %s on line 74
 NULL
 Nested write:
 
@@ -108,20 +115,26 @@ Nested isset():
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 
+Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
+
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 bool(true)
 Nested empty():
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 
+Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
+
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 bool(false)
 Nested null coalesce:
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
-int(25)
+
+Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
+int(30)
 Nested unset():
 
 Deprecated: Implicit conversion from float %F to int loses precision in %s on line %d
@@ -164,57 +177,12 @@ Cannot access offset of type %s in isset or empty
 Nested null coalesce:
 Cannot access offset of type %s in isset or empty
 Nested unset():
-
-Notice: Indirect modification of overloaded element of ArrayObject has no effect in %s on line %d
-Cannot unset offset of type %s on ArrayObject
+Cannot access offset of type %s on ArrayObject
 
 OUTPUT;
 
 $EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTED_OUTPUT_INVALID_OFFSETS) . '$/s';
 
-const EXPECTED_OUTPUT_NULL_OFFSET = <<<OUTPUT
-Read before write:
-
-Warning: Undefined array key "" in %s on line 8
-NULL
-Write:
-Read:
-
-Warning: Undefined array key "" in %s on line 22
-NULL
-Read-Write:
-
-Warning: Undefined array key "" in %s on line 29
-isset():
-bool(false)
-empty():
-bool(true)
-null coalesce:
-string(7) "default"
-Reference to dimension:
-Value of reference:
-NULL
-Value of container dimension after write to reference (should be int(100) if successful):
-int(100)
-unset():
-Nested read:
-
-Warning: Undefined array key "" in %s on line 74
-
-Warning: Trying to access array offset on null in %s on line 74
-NULL
-Nested write:
-Nested Read-Write:
-Nested isset():
-bool(true)
-Nested empty():
-bool(false)
-Nested null coalesce:
-int(30)
-Nested unset():
-
-OUTPUT;
-
 const EXPECTED_OUTPUT_RESOURCE_STDERR_OFFSETS = <<<OUTPUT
 Read before write:
 
@@ -236,14 +204,20 @@ Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 29
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 29
 isset():
 
+Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 36
+
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 36
 bool(true)
 empty():
 
+Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 42
+
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 42
 bool(false)
 null coalesce:
 
+Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 48
+
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 48
 int(25)
 Reference to dimension:
@@ -280,18 +254,24 @@ Nested isset():
 
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 95
 
+Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 95
+
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 95
 bool(true)
 Nested empty():
 
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 101
 
+Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 101
+
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 101
 bool(false)
 Nested null coalesce:
 
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 107
 
+Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 107
+
 Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 107
 int(30)
 Nested unset():
@@ -323,7 +303,6 @@ foreach ($offsets as $dimension) {
         !preg_match($EXPECTED_OUTPUT_VALID_OFFSETS_REGEX, $varOutput)
         && !preg_match($EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX, $varOutput)
         && !preg_match($EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX, $varOutput)
-        && $varOutput !== EXPECTED_OUTPUT_NULL_OFFSET
         && $varOutput !== EXPECTED_OUTPUT_RESOURCE_STDERR_OFFSETS
     ) {
         file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_ArrayObject_container_{$failuresNb}.txt", $varOutput);
@@ -354,7 +333,6 @@ foreach ($offsets as $offset) {
         !preg_match($EXPECTED_OUTPUT_VALID_OFFSETS_REGEX, $varOutput)
         && !preg_match($EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX, $varOutput)
         && !preg_match($EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX, $varOutput)
-        && $varOutput !== EXPECTED_OUTPUT_NULL_OFFSET
         && $varOutput !== EXPECTED_OUTPUT_RESOURCE_STDERR_OFFSETS
     ) {
         file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_ArrayObject_container_{$failuresNb}.txt", $varOutput);