bug #25053 [Serializer] Fixing PropertyNormalizer supports parent properties (Christopher Hertel)

nicolas-grekas · nicolas-grekas · commit 961981577d3c · 2017-11-20T21:50:55.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Serializer] Fixing PropertyNormalizer supports parent properties | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a With 5ecafc5 support for parent properties was added to 3.4, but supports method was not updated for child classes without properties. Commits ------- a879e4f fixing that PropertyNormalizer supports parent properties
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -60,11 +60,13 @@ private function supports($class)
         $class = new \ReflectionClass($class);
 
         // We look for at least one non-static property
-        foreach ($class->getProperties() as $property) {
-            if (!$property->isStatic()) {
-                return true;
+        do {
+            foreach ($class->getProperties() as $property) {
+                if (!$property->isStatic()) {
+                    return true;
+                }
             }
-        }
+        } while ($class = $class->getParentClass());
 
         return false;
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -441,6 +441,11 @@ public function testMaxDepth()
 
         $this->assertEquals($expected, $result);
     }
+
+    public function testInheritedPropertiesSupport()
+    {
+        $this->assertTrue($this->normalizer->supportsNormalization(new PropertyChildDummy()));
+    }
 }
 
 class PropertyDummy
@@ -509,3 +514,12 @@ class StaticPropertyDummy
 {
     private static $property = 'value';
 }
+
+class PropertyParentDummy
+{
+    private $foo = 'bar';
+}
+
+class PropertyChildDummy extends PropertyParentDummy
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -441,6 +441,11 @@ public function testMaxDepth()`
`441`	`441`
`442`	`442`	`$this->assertEquals($expected, $result);`
`443`	`443`	`}`
	`444`	`+`
	`445`	`+ public function testInheritedPropertiesSupport()`
	`446`	`+ {`
	`447`	`+ $this->assertTrue($this->normalizer->supportsNormalization(new PropertyChildDummy()));`
	`448`	`+ }`
`444`	`449`	`}`
`445`	`450`
`446`	`451`	`class PropertyDummy`
`@@ -509,3 +514,12 @@ class StaticPropertyDummy`
`509`	`514`	`{`
`510`	`515`	`private static $property = 'value';`
`511`	`516`	`}`
	`517`	`+`
	`518`	`+class PropertyParentDummy`
	`519`	`+{`
	`520`	`+ private $foo = 'bar';`
	`521`	`+}`
	`522`	`+`
	`523`	`+class PropertyChildDummy extends PropertyParentDummy`
	`524`	`+{`
	`525`	`+}`