Prevent infinite loop in PropertyMetadata

wesleylancel · wesleylancel · commit c7f806325737 · 2016-10-04T09:14:18.000+02:00
diff --git a/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php b/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php
@@ -58,8 +58,16 @@ public function getPropertyValue($object)
      */
     protected function newReflectionMember($objectOrClassName)
     {
+        $originalClass = is_string($objectOrClassName) ? $objectOrClassName : get_class($objectOrClassName);
+
         while (!property_exists($objectOrClassName, $this->getName())) {
             $objectOrClassName = get_parent_class($objectOrClassName);
+
+            if (false === $objectOrClassName) {
+                throw new ValidatorException(
+                    sprintf('Property "%s" does not exist in class "%s"', $this->getName(), $originalClass)
+                );
+            }
         }
 
         $member = new \ReflectionProperty($objectOrClassName, $this->getName());
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/PropertyMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/PropertyMetadataTest.php
@@ -42,4 +42,14 @@ public function testGetPropertyValueFromOverriddenPrivateProperty()
         $this->assertTrue($metadata->isPublic($entity));
         $this->assertEquals('Overridden data', $metadata->getPropertyValue($entity));
     }
+
+    public function testGetPropertyValueFromRemovedProperty()
+    {
+        $entity = new Entity('foobar');
+        $metadata = new PropertyMetadata(self::CLASSNAME, 'internal');
+        $metadata->name = 'test';
+
+        $this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');
+        $metadata->getPropertyValue($entity);
+    }
 }
