bug #29418 [VarExporter] fix dumping protected property from abstract classes (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 47135371ab6d · 2018-12-02T10:49:17.000+01:00
This PR was merged into the 4.2 branch. Discussion ---------- [VarExporter] fix dumping protected property from abstract classes | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #29406 | License | MIT | Doc PR | - Commits ------- 0132ba9 [VarExporter] fix dumping protected property from abstract classes
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -125,8 +125,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     $c = 'stdClass';
                 } elseif ('*' === $n[1]) {
                     $n = substr($n, 3);
-                    $c = $reflector->getProperty($n)->class;
-                    if ('Error' === $c) {
+                    if ('Error' === $c = $class) {
                         $c = 'TypeError';
                     } elseif ('Exception' === $c) {
                         $c = 'ErrorException';
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/abstract-parent.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/abstract-parent.php
@@ -0,0 +1,17 @@
+<?php
+
+return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
+    $o = [
+        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\ConcreteClass'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\ConcreteClass')),
+    ],
+    null,
+    [
+        'Symfony\\Component\\VarExporter\\Tests\\ConcreteClass' => [
+            'foo' => [
+                123,
+            ],
+        ],
+    ],
+    $o[0],
+    []
+);
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/final-error.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/final-error.php
@@ -6,7 +6,7 @@
     ]),
     null,
     [
-        'TypeError' => [
+        'Symfony\\Component\\VarExporter\\Tests\\FinalError' => [
             'file' => [
                 \dirname(__DIR__).\DIRECTORY_SEPARATOR.'VarExporterTest.php',
             ],
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/private.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/private.php
@@ -10,13 +10,17 @@
         'Symfony\\Component\\VarExporter\\Tests\\MyPrivateValue' => [
             'prot' => [
                 123,
-                123,
             ],
             'priv' => [
                 234,
                 234,
             ],
         ],
+        'Symfony\\Component\\VarExporter\\Tests\\MyPrivateChildValue' => [
+            'prot' => [
+                1 => 123,
+            ],
+        ],
     ],
     [
         $o[0],
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -192,6 +192,8 @@ public function provideExport()
         $value->bis = new \ReflectionClass($value);
 
         yield array('wakeup-refl', $value);
+
+        yield array('abstract-parent', new ConcreteClass());
     }
 }
 
@@ -320,3 +322,16 @@ public function __clone()
         throw new \BadMethodCallException('Should not be called.');
     }
 }
+
+abstract class AbstractClass
+{
+    protected $foo;
+}
+
+class ConcreteClass extends AbstractClass
+{
+    public function __construct()
+    {
+        $this->foo = 123;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`]),`
`7`	`7`	`null,`
`8`	`8`	`[`
`9`		`- 'TypeError' => [`
	`9`	`+ 'Symfony\\Component\\VarExporter\\Tests\\FinalError' => [`
`10`	`10`	`'file' => [`
`11`	`11`	`\dirname(__DIR__).\DIRECTORY_SEPARATOR.'VarExporterTest.php',`
`12`	`12`	`],`
Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,8 @@ public function provideExport()`
`192`	`192`	`$value->bis = new \ReflectionClass($value);`
`193`	`193`
`194`	`194`	`yield array('wakeup-refl', $value);`
	`195`	`+`
	`196`	`+ yield array('abstract-parent', new ConcreteClass());`
`195`	`197`	`}`
`196`	`198`	`}`
`197`	`199`
`@@ -320,3 +322,16 @@ public function __clone()`
`320`	`322`	`throw new \BadMethodCallException('Should not be called.');`
`321`	`323`	`}`
`322`	`324`	`}`
	`325`	`+`
	`326`	`+abstract class AbstractClass`
	`327`	`+{`
	`328`	`+ protected $foo;`
	`329`	`+}`
	`330`	`+`
	`331`	`+class ConcreteClass extends AbstractClass`
	`332`	`+{`
	`333`	`+ public function __construct()`
	`334`	`+ {`
	`335`	`+ $this->foo = 123;`
	`336`	`+ }`
	`337`	`+}`