Don't use reflections when possible

GuilhemN · GuilhemN · commit a46270a61a8f · 2016-03-05T18:37:04.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -363,9 +363,8 @@ public function initialized($id)
     public function getServiceIds()
     {
         $ids = array();
-        $r = new \ReflectionClass($this);
-        foreach ($r->getMethods() as $method) {
-            if (preg_match('/^get(.+)Service$/', $method->name, $match)) {
+        foreach (get_class_methods($this) as $method) {
+            if (preg_match('/^get(.+)Service$/', $method, $match)) {
                 $ids[] = self::underscore($match[1]);
             }
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -298,6 +298,11 @@ public function otherMethod()
     {
         throw new \RuntimeException('Dummy::otherMethod() should not be called');
     }
+
+    protected function getPrivate()
+    {
+        throw new \RuntimeException('Dummy::getPrivate() should not be called');        
+    }
 }
 
 class GetConstructorDummy
diff --git a/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php b/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php
@@ -45,12 +45,11 @@ public function getPropertyValue($object)
      */
     protected function newReflectionMember($objectOrClassName)
     {
-        $class = new \ReflectionClass($objectOrClassName);
-        while (!$class->hasProperty($this->getName())) {
-            $class = $class->getParentClass();
+        while (!property_exists($objectOrClassName, $this->getName())) {
+            $objectOrClassName = get_parent_class($objectOrClassName);
         }
 
-        $member = new \ReflectionProperty($class->getName(), $this->getName());
+        $member = new \ReflectionProperty($objectOrClassName, $this->getName());
         $member->setAccessible(true);
 
         return $member;

Original file line number	Diff line number	Diff line change
`@@ -363,9 +363,8 @@ public function initialized($id)`
`363`	`363`	`public function getServiceIds()`
`364`	`364`	`{`
`365`	`365`	`$ids = array();`
`366`		`- $r = new \ReflectionClass($this);`
`367`		`- foreach ($r->getMethods() as $method) {`
`368`		`- if (preg_match('/^get(.+)Service$/', $method->name, $match)) {`
	`366`	`+ foreach (get_class_methods($this) as $method) {`
	`367`	`+ if (preg_match('/^get(.+)Service$/', $method, $match)) {`
`369`	`368`	`$ids[] = self::underscore($match[1]);`
`370`	`369`	`}`
`371`	`370`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,11 @@ public function otherMethod()`
`298`	`298`	`{`
`299`	`299`	`throw new \RuntimeException('Dummy::otherMethod() should not be called');`
`300`	`300`	`}`
	`301`	`+`
	`302`	`+ protected function getPrivate()`
	`303`	`+ {`
	`304`	`+ throw new \RuntimeException('Dummy::getPrivate() should not be called');`
	`305`	`+ }`
`301`	`306`	`}`
`302`	`307`
`303`	`308`	`class GetConstructorDummy`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,11 @@ public function getPropertyValue($object)`
`45`	`45`	`*/`
`46`	`46`	`protected function newReflectionMember($objectOrClassName)`
`47`	`47`	`{`
`48`		`- $class = new \ReflectionClass($objectOrClassName);`
`49`		`- while (!$class->hasProperty($this->getName())) {`
`50`		`- $class = $class->getParentClass();`
	`48`	`+ while (!property_exists($objectOrClassName, $this->getName())) {`
	`49`	`+ $objectOrClassName = get_parent_class($objectOrClassName);`
`51`	`50`	`}`
`52`	`51`
`53`		`- $member = new \ReflectionProperty($class->getName(), $this->getName());`
	`52`	`+ $member = new \ReflectionProperty($objectOrClassName, $this->getName());`
`54`	`53`	`$member->setAccessible(true);`
`55`	`54`
`56`	`55`	`return $member;`