[VarDumper] Fix dumping ArrayObject with DumpDataCollector

Author: HypeMC

Caster/SplCaster.php

@@ -229,10 +229,11 @@ private static function castSplArray($c, array $a, Stub $stub, bool $isNested):
             $a = Caster::castObject($c, \get_class($c), method_exists($c, '__debugInfo'), $stub->class);
             $c->setFlags($flags);
         }
-        if (\PHP_VERSION_ID < 70400) {
-            $a[$prefix.'storage'] = $c->getArrayCopy();
-        }
+
+        unset($a["\0ArrayObject\0storage"], $a["\0ArrayIterator\0storage"]);
+
         $a += [
+            $prefix.'storage' => $c->getArrayCopy(),
             $prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
             $prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),
         ];

Dumper/ContextProvider/SourceContextProvider.php

@@ -44,7 +44,7 @@ public function getContext(): ?array
 
         $file = $trace[1]['file'];
         $line = $trace[1]['line'];
-        $name = false;
+        $name = '-' === $file || 'Standard input code' === $file ? 'Standard input code' : false;
         $fileExcerpt = false;
 
         for ($i = 2; $i < $this->limit; ++$i) {

Tests/Caster/SplCasterTest.php

@@ -174,17 +174,14 @@ class([123]) extends \ArrayObject {};
         $expected = <<<EOTXT
 ArrayObject@anonymous {
   +"foo": 234
-  -storage: array:1 [
+  storage: array:1 [
     0 => 123
   ]
   flag::STD_PROP_LIST: false
   flag::ARRAY_AS_PROPS: false
   iteratorClass: "ArrayIterator"
 }
 EOTXT;
-        if (\PHP_VERSION_ID < 70400) {
-            $expected = str_replace('-storage:', 'storage:', $expected);
-        }
         $this->assertDumpEquals($expected, $var);
     }
 
@@ -195,16 +192,13 @@ public function testArrayIterator()
         $expected = <<<EOTXT
 Symfony\Component\VarDumper\Tests\Caster\MyArrayIterator {
   -foo: 123
-  -storage: array:1 [
+  storage: array:1 [
     0 => 234
   ]
   flag::STD_PROP_LIST: false
   flag::ARRAY_AS_PROPS: false
 }
 EOTXT;
-        if (\PHP_VERSION_ID < 70400) {
-            $expected = str_replace('-storage:', 'storage:', $expected);
-        }
         $this->assertDumpEquals($expected, $var);
     }
 

Tests/Integration/dump_data_collector.phpt renamed to Tests/Dumper/functions/dump_data_collector_with_spl_array.phpt

@@ -6,13 +6,12 @@ putenv('NO_COLOR=1');
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
-    $vendor = \dirname($vendor);
+    $vendor = dirname($vendor);
 }
 require $vendor.'/vendor/autoload.php';
 
 use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
-use Symfony\Component\VarDumper\Dumper\CliDumper;
 use Symfony\Component\VarDumper\VarDumper;
 
 VarDumper::setHandler(function ($var, string $label = null) {
@@ -30,14 +29,41 @@ VarDumper::setHandler(function ($var, string $label = null) {
     $handler($var, $label);
 });
 
-$schemas = new \ArrayObject();
-dump($schemas);
-$schemas['X'] = new \ArrayObject(['type' => 'object']);
+$arrayObject = new \ArrayObject();
+dump($arrayObject);
+$arrayObject['X'] = 'A';
+$arrayObject['Y'] = new \ArrayObject(['type' => 'object']);
+$arrayObject['Y']['Z'] = 'B';
+
+$arrayIterator = new \ArrayIterator();
+dump($arrayIterator);
+$arrayIterator['X'] = 'A';
+$arrayIterator['Y'] = new \ArrayIterator(['type' => 'object']);
+$arrayIterator['Y']['Z'] = 'B';
+
+$recursiveArrayIterator = new \RecursiveArrayIterator();
+dump($recursiveArrayIterator);
+$recursiveArrayIterator['X'] = 'A';
+$recursiveArrayIterator['Y'] = new \RecursiveArrayIterator(['type' => 'object']);
+$recursiveArrayIterator['Y']['Z'] = 'B';
 
 --EXPECTF--
+%s on line %d:
 ArrayObject {#%d
-  -storage: []
+  storage: []
   flag::STD_PROP_LIST: false
   flag::ARRAY_AS_PROPS: false
   iteratorClass: "ArrayIterator"
 }
+%s on line %d:
+ArrayIterator {#%d
+  storage: []
+  flag::STD_PROP_LIST: false
+  flag::ARRAY_AS_PROPS: false
+}
+%s on line %d:
+RecursiveArrayIterator {#%d
+  storage: []
+  flag::STD_PROP_LIST: false
+  flag::ARRAY_AS_PROPS: false
+}

Tests/Integration/dump_data_collector2.phpt

@@ -23,6 +23,7 @@
     "require-dev": {
         "ext-iconv": "*",
         "symfony/console": "^4.4|^5.0|^6.0",
+        "symfony/http-kernel": "^4.4|^5.0|^6.0",
         "symfony/process": "^4.4|^5.0|^6.0",
         "symfony/uid": "^5.1|^6.0",
         "twig/twig": "^2.13|^3.0.4"

composer.json

@@ -17,6 +17,7 @@
     <testsuites>
         <testsuite name="Symfony VarDumper Component Test Suite">
             <directory>./Tests/</directory>
+            <directory suffix=".phpt">./Tests/Dumper/functions/</directory>
         </testsuite>
     </testsuites>