Remove the __call check.

Bogdanp · Bogdanp · commit 73ecbf1b448a · 2012-08-21T23:20:24.000+03:00
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Magician.php b/src/Symfony/Component/Form/Tests/Fixtures/Magician.php
@@ -29,6 +29,5 @@ public function __call($method, $arguments) {
         if (preg_match('/^(get|is|has)([A-Z].*)$/', $method, $matches)) {
             return $this->{lcfirst($matches[2])};
         }
-        return null;
     }
 }
diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php
@@ -420,7 +420,13 @@ private function &readProperty(&$objectOrArray, $property, $isIndex)
             $isser = 'is'.$camelProp;
             $hasser = 'has'.$camelProp;
 
-            if ($reflClass->hasMethod($getter)) {
+            if (is_callable(array($objectOrArray, $getter))) {
+                $result[self::VALUE] = $objectOrArray->$getter();
+            } elseif (is_callable(array($objectOrArray, $isser))) {
+                $result[self::VALUE] = $objectOrArray->$isser();
+            } elseif (is_callable(array($objectOrArray, $hasser))) {
+                $result[self::VALUE] = $objectOrArray->$hasser();
+            } elseif ($reflClass->hasMethod($getter)) {
                 if (!$reflClass->getMethod($getter)->isPublic()) {
                     throw new PropertyAccessDeniedException(sprintf('Method "%s()" is not public in class "%s"', $getter, $reflClass->name));
                 }
@@ -438,15 +444,6 @@ private function &readProperty(&$objectOrArray, $property, $isIndex)
                 }
 
                 $result[self::VALUE] = $objectOrArray->$hasser();
-            } elseif ($reflClass->hasMethod('__call') &&
-                      is_callable(array($objectOrArray, $getter))) {
-                $result[self::VALUE] = $objectOrArray->$getter();
-            } elseif ($reflClass->hasMethod('__call') &&
-                      is_callable(array($objectOrArray, $isser))) {
-                $result[self::VALUE] = $objectOrArray->$isser();
-            } elseif ($reflClass->hasMethod('__call') &&
-                      is_callable(array($objectOrArray, $hasser))) {
-                $result[self::VALUE] = $objectOrArray->$hasser();
             } elseif ($reflClass->hasMethod('__get')) {
                 // needed to support magic method __get
                 $result[self::VALUE] = $objectOrArray->$property;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,5 @@ public function __call($method, $arguments) {`
`29`	`29`	`if (preg_match('/^(get\|is\|has)([A-Z].*)$/', $method, $matches)) {`
`30`	`30`	`return $this->{lcfirst($matches[2])};`
`31`	`31`	`}`
`32`		`- return null;`
`33`	`32`	`}`
`34`	`33`	`}`