Add more containers

Author: Girgias

Zend/tests/offsets/appending_containers.phpt

@@ -3,17 +3,7 @@ Appending containers
 --FILE--
 <?php
 
-$containers = [
-    null,
-    false,
-    true,
-    10,
-    25.5,
-    'string',
-    [],
-    new stdClass(),
-    STDERR,
-];
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'test_offset_helpers.inc';
 
 foreach ($containers as $container) {
     try {
@@ -40,9 +30,31 @@ Cannot use a scalar value as an array
 Cannot use a scalar value as an array
 Cannot use a scalar value as an array
 [] operator not supported for strings
+[] operator not supported for strings
+[] operator not supported for strings
 array(1) {
   [0]=>
   string(5) "value"
 }
-Cannot use object of type stdClass as array
 Cannot use a scalar value as an array
+Cannot use object of type stdClass as array
+object(ArrayObject)#2 (1) {
+  ["storage":"ArrayObject":private]=>
+  array(1) {
+    [0]=>
+    string(5) "value"
+  }
+}
+string(12) "A::offsetSet"
+NULL
+string(5) "value"
+object(A)#3 (0) {
+}
+string(12) "B::offsetSet"
+NULL
+string(5) "value"
+object(B)#4 (1) {
+  ["storage":"ArrayObject":private]=>
+  array(0) {
+  }
+}

Zend/tests/offsets/runtime_compile_time_offset_access.phpt

@@ -12,20 +12,6 @@ opcache.file_update_protection=1
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'test_offset_helpers.inc';
 
-$containers = [
-    null,
-    false,
-    true,
-    4,
-    5.5,
-    '10',
-    '25.5',
-    'string',
-    [],
-    STDERR,
-    new stdClass(),
-];
-
 function makeTestFile($container, $offset) {
     $offset_p = makeOffset($offset);
     $container_p = makeContainer($container);
@@ -110,6 +96,9 @@ foreach ($containers as $container_orig) {
 
         $dimension = $offset;
         $container = $container_orig;
+        if (is_object($container_orig)) {
+            $container = clone $container_orig;
+        }
         include $var_dim_filename;
         $varOutput = ob_get_contents();
         ob_clean();
@@ -120,9 +109,9 @@ foreach ($containers as $container_orig) {
         );
 
         if ($constOutput !== $varOutput) {
-            file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_const_{$failuresNb}.txt", $constOutput);
-            file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_var_{$failuresNb}.txt", $varOutput);
-            file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_test_case_{$failuresNb}.txt", makeTestFile($container_orig, $offset));
+            file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_{$failuresNb}_const.txt", $constOutput);
+            file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_{$failuresNb}_var.txt", $varOutput);
+            file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_{$failuresNb}_test_case.txt", makeTestFile($container_orig, $offset));
             ++$failuresNb;
             $failures[] = $error;
         }
@@ -143,4 +132,4 @@ $fl = __DIR__ . DIRECTORY_SEPARATOR . 'compare_binary_offsets_temp.php';
 @unlink($fl);
 ?>
 --EXPECT--
-Executed 231 tests
+Executed 294 tests

Zend/tests/offsets/test_offset_helpers.inc

@@ -22,6 +22,15 @@ function makeContainer($container) {
     if ($container instanceof stdClass) {
         return "new stdClass()";
     }
+    if ($container instanceof B) {
+        return "new B()";
+    }
+    if ($container instanceof A) {
+        return "new A()";
+    }
+    if ($container instanceof ArrayObject) {
+        return "new ArrayObject()";
+    }
     return var_export($container, true);
 }
 function makeOffset($offset) {
@@ -55,6 +64,71 @@ function expectf_to_regex(string $wanted): string
     ]);
 }
 
+class A implements ArrayAccess {
+    public function offsetSet($offset, $value): void {
+        var_dump(__METHOD__);
+        var_dump($offset);
+        var_dump($value);
+    }
+    public function offsetGet($offset): mixed {
+        var_dump(__METHOD__);
+        var_dump($offset);
+        return "dummy";
+    }
+    public function offsetUnset($offset): void {
+        var_dump(__METHOD__);
+        var_dump($offset);
+    }
+    public function offsetExists($offset): bool {
+        var_dump(__METHOD__);
+        var_dump($offset);
+        return false;
+    }
+}
+
+class B extends ArrayObject {
+    public function offsetSet($offset, $value): void {
+        var_dump(__METHOD__);
+        var_dump($offset);
+        var_dump($value);
+    }
+    public function offsetGet($offset): mixed {
+        var_dump(__METHOD__);
+        var_dump($offset);
+        return "dummy";
+    }
+    public function offsetUnset($offset): void {
+        var_dump(__METHOD__);
+        var_dump($offset);
+    }
+    public function offsetExists($offset): bool {
+        var_dump(__METHOD__);
+        var_dump($offset);
+        return false;
+    }
+    public function append(mixed $value) : void{
+        var_dump(__METHOD__);
+        var_dump($value);
+    }
+}
+
+$containers = [
+    null,
+    false,
+    true,
+    4,
+    5.5,
+    '10',
+    '25.5',
+    'string',
+    [],
+    STDERR,
+    new stdClass(),
+    new ArrayObject(),
+    new A(),
+    new B(),
+];
+
 $offsets = [
     null,
     false,