[Form] Fixed PropertyPath handling of __get() method that returns a constant

webmozart · webmozart · commit 6e1462e0c0a5 · 2012-07-09T18:15:56.000+02:00
diff --git a/src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php b/src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
@@ -213,6 +213,18 @@ public function testGetValueReadsMagicGet()
         $this->assertSame('foobar', $path->getValue($object));
     }
 
+    /*
+     * https://github.com/symfony/symfony/pull/4450
+     */
+    public function testGetValueReadsMagicGetThatReturnsConstant()
+    {
+        $path = new PropertyPath('magicProperty');
+
+        $object = new Magician();
+
+        $this->assertNull($path->getValue($object));
+    }
+
     /**
      * @expectedException Symfony\Component\Form\Exception\PropertyAccessDeniedException
      */
diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php
@@ -402,7 +402,7 @@ protected function &readProperty(&$objectOrArray, $property, $isIndex)
                 $result = $objectOrArray->$hasser();
             } elseif ($reflClass->hasMethod('__get')) {
                 // needed to support magic method __get
-                $result =& $objectOrArray->$property;
+                $result = $objectOrArray->$property;
             } elseif ($reflClass->hasProperty($property)) {
                 if (!$reflClass->getProperty($property)->isPublic()) {
                     throw new PropertyAccessDeniedException(sprintf('Property "%s" is not public in class "%s". Maybe you should create the method "%s()" or "%s()"?', $property, $reflClass->name, $getter, $isser));
