Commitc1ae7b6

authored and

committed

Prevent infinite loop in PropertyMetadata

1 parentab6f181 commitc1ae7b6Copy full SHA for c1ae7b6

File tree

+16

-0

lines changed

src/Symfony/Component/Validator
- Mapping
  - PropertyMetadata.php
- Tests/Mapping
  - PropertyMetadataTest.php

+16

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,14 @@ public function getPropertyValue($object)`
`58`	`58`	`*/`
`59`	`59`	`protectedfunctionnewReflectionMember($objectOrClassName)`
`60`	`60`	`{`
	`61`	`+$originalClass =is_string($objectOrClassName) ?$objectOrClassName :get_class($objectOrClassName);`
	`62`	`+`
`61`	`63`	`while (!property_exists($objectOrClassName,$this->getName())) {`
`62`	`64`	`$objectOrClassName =get_parent_class($objectOrClassName);`
	`65`	`+`
	`66`	`+if (false ===$objectOrClassName) {`
	`67`	`+thrownewValidatorException(sprintf('Property "%s" does not exist in class "%s"',$this->getName(),$originalClass));`
	`68`	`+ }`
`63`	`69`	`}`
`64`	`70`
`65`	`71`	`$member =new \ReflectionProperty($objectOrClassName,$this->getName());`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,14 @@ public function testGetPropertyValueFromOverriddenPrivateProperty()`
`42`	`42`	`$this->assertTrue($metadata->isPublic($entity));`
`43`	`43`	`$this->assertEquals('Overridden data',$metadata->getPropertyValue($entity));`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+publicfunctiontestGetPropertyValueFromRemovedProperty()`
	`47`	`+ {`
	`48`	`+$entity =newEntity('foobar');`
	`49`	`+$metadata =newPropertyMetadata(self::CLASSNAME,'internal');`
	`50`	`+$metadata->name ='test';`
	`51`	`+`
	`52`	`+$this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');`
	`53`	`+$metadata->getPropertyValue($entity);`
	`54`	`+ }`
`45`	`55`	`}`

Comments

(0)