[PropertyAccess] Refactored PropertyAccessorTest

symfony · fabpot · Mar 31, 2014 · Mar 28, 2014 · Mar 28, 2014 · Mar 28, 2014
commit 0488389d95033a60b3de14340c5a532c6a6af18f
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -116,7 +116,7 @@ public function setValue(&$objectOrArray, $propertyPath, $value)
      *
      * @throws UnexpectedTypeException If a value within the path is neither object nor array.
      */
-    private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $propertyPath, $lastIndex, $throwExceptionOnNonexistantIndex = false)
+    private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $propertyPath, $lastIndex, $throwExceptionOnInvalidIndex = false)
     {
         $propertyValues = array();
 
@@ -131,9 +131,10 @@ private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $pr
 
             // Create missing nested arrays on demand
             if ($isIndex && $isArrayAccess && !isset($objectOrArray[$property])) {
-                if ($throwExceptionOnNonexistantIndex) {
+                if ($throwExceptionOnInvalidIndex) {
                     throw new NoSuchIndexException(sprintf('Cannot read property "%s". Available properties are "%s"', $property, print_r(array_keys($objectOrArray), true)));
                 }
+
                 $objectOrArray[$property] = $i + 1 < $propertyPath->getLength() ? array() : null;
             }
 
@@ -412,8 +413,8 @@ private function findAdderAndRemover(\ReflectionClass $reflClass, array $singula
             $addMethod = 'add'.$singular;
             $removeMethod = 'remove'.$singular;
 
-            $addMethodFound = $this->isAccessible($reflClass, $addMethod, 1);
-            $removeMethodFound = $this->isAccessible($reflClass, $removeMethod, 1);
+            $addMethodFound = $this->isMethodAccessible($reflClass, $addMethod, 1);
+            $removeMethodFound = $this->isMethodAccessible($reflClass, $removeMethod, 1);
 
             if ($addMethodFound && $removeMethodFound) {
                 return array($addMethod, $removeMethod);
@@ -442,7 +443,7 @@ private function findAdderAndRemover(\ReflectionClass $reflClass, array $singula
      * @return Boolean Whether the method is public and has $parameters
      *                                      required parameters
      */
-    private function isAccessible(\ReflectionClass $class, $methodName, $parameters)
+    private function isMethodAccessible(\ReflectionClass $class, $methodName, $parameters)
     {
         if ($class->hasMethod($methodName)) {
             $method = $class->getMethod($methodName);

diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/Author.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/Author.php
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/Magician.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/Magician.php
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/MagicianCall.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/MagicianCall.php
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClass.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClass.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
+
+class TestClass
+{
+    public $publicProperty;
+    protected $protectedProperty;
+    private $privateProperty;
+
+    private $publicAccessor;
+    private $publicIsAccessor;
+    private $publicHasAccessor;
+
+    public function __construct($value)
+    {
+        $this->publicProperty = $value;
+        $this->publicAccessor = $value;
+        $this->publicIsAccessor = $value;
+        $this->publicHasAccessor = $value;
+    }
+
+    public function setPublicAccessor($value)
+    {
+        $this->publicAccessor = $value;
+    }
+
+    public function getPublicAccessor()
+    {
+        return $this->publicAccessor;
+    }
+
+    public function setPublicIsAccessor($value)
+    {
+        $this->publicIsAccessor = $value;
+    }
+
+    public function isPublicIsAccessor()
+    {
+        return $this->publicIsAccessor;
+    }
+
+    public function setPublicHasAccessor($value)
+    {
+        $this->publicHasAccessor = $value;
+    }
+
+    public function hasPublicHasAccessor()
+    {
+        return $this->publicHasAccessor;
+    }
+
+    protected function setProtectedAccessor($value)
+    {
+    }
+
+    protected function getProtectedAccessor()
+    {
+        return 'foobar';
+    }
+
+    protected function setProtectedIsAccessor($value)
+    {
+    }
+
+    protected function isProtectedIsAccessor()
+    {
+        return 'foobar';
+    }
+
+    protected function setProtectedHasAccessor($value)
+    {
+    }
+
+    protected function hasProtectedHasAccessor()
+    {
+        return 'foobar';
+    }
+
+    private function setPrivateAccessor($value)
+    {
+    }
+
+    private function getPrivateAccessor()
+    {
+        return 'foobar';
+    }
+
+    private function setPrivateIsAccessor($value)
+    {
+    }
+
+    private function isPrivateIsAccessor()
+    {
+        return 'foobar';
+    }
+
+    private function setPrivateHasAccessor($value)
+    {
+    }
+
+    private function hasPrivateHasAccessor()
+    {
+        return 'foobar';
+    }
+}
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassMagicCall.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassMagicCall.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
+
+class TestClassMagicCall
+{
+    private $magicCallProperty;
+
+    public function __construct($value)
+    {
+        $this->magicCallProperty = $value;
+    }
+
+    public function __call($method, array $args)
+    {
+        if ('getMagicCallProperty' === $method) {
+            return $this->magicCallProperty;
+        }
+
+        if ('getConstantMagicCallProperty' === $method) {
+            return 'constant value';
+        }
+
+        if ('setMagicCallProperty' === $method) {
+            $this->magicCallProperty = reset($args);
+        }
+
+        return null;
+    }
+}
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassMagicGet.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassMagicGet.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
+
+class TestClassMagicGet
+{
+    private $magicProperty;
+
+    public function __construct($value)
+    {
+        $this->magicProperty = $value;
+    }
+
+    public function __set($property, $value)
+    {
+        if ('magicProperty' === $property) {
+            $this->magicProperty = $value;
+        }
+    }
+
+    public function __get($property)
+    {
+        if ('magicProperty' === $property) {
+            return $this->magicProperty;
+        }
+
+        if ('constantMagicProperty' === $property) {
+            return 'constant value';
+        }
+
+        return null;
+    }
+}