- Default Resolver retrieve property values using only PropertyAccess.

- Refactor TypeResolver

Author: Jeremiah VALERIE

Resolver/Resolver.php

@@ -25,33 +25,28 @@ class Resolver
     public static function defaultResolveFn($source, $args, ResolveInfo $info)
     {
         $fieldName = $info->fieldName;
-        $property = null;
+        $value = null;
 
         $index = sprintf('[%s]', $fieldName);
 
         if (self::getAccessor()->isReadable($source, $index)) {
-            $property = self::getAccessor()->getValue($source, $index);
+            $value = self::getAccessor()->getValue($source, $index);
         } elseif (is_object($source)) {
-            $property = self::propertyValueFromObject($source, $fieldName);
+            $value = self::propertyValueFromObject($source, $fieldName);
         }
 
-        return $property instanceof \Closure ? $property($source, $args, $info) : $property;
+        return $value instanceof \Closure ? $value($source, $args, $info) : $value;
     }
 
     private static function propertyValueFromObject($object, $fieldName)
     {
-        $property = null;
+        $value = null;
 
-        // accessor try to access the value using methods
-        // first before using public property directly
-        // not what we wont here!
-        if (isset($object->{$fieldName})) {
-            $property = $object->{$fieldName};
-        } elseif (self::getAccessor()->isReadable($object, $fieldName)) {
-            $property = self::getAccessor()->getValue($object, $fieldName);
+        if (self::getAccessor()->isReadable($object, $fieldName)) {
+            $value = self::getAccessor()->getValue($object, $fieldName);
         }
 
-        return $property;
+        return $value;
     }
 
     private static function getAccessor()

Resolver/TypeResolver.php

@@ -53,35 +53,32 @@ public function setMapping($mapping)
      */
     public function resolve($alias)
     {
+        if (null === $alias) {
+            return;
+        }
+
         if (null !== $type = $this->cache->fetch($alias)) {
             return $type;
         }
 
-        $type = $this->getType($alias);
+        $type = $this->string2Type($alias);
 
         $this->cache->save($alias, $type);
 
         return $type;
     }
 
-    private function getType($alias)
+    private function string2Type($alias)
     {
-        if (!is_string($alias)) {
-            return $alias;
-        }
-        // Non-Null
-        if ('!' === $alias[strlen($alias) - 1]) {
-            return Type::nonNull($this->getType(substr($alias, 0, -1)));
+        if (false !== ($type = $this->wrapTypeIfNeeded($alias))) {
+            return $type;
         }
-        // List
-        if ('[' === $alias[0]) {
-            if (']' !== $alias[strlen($alias) - 1]) {
-                throw new UnresolvableException(sprintf('Invalid type "%s"', $alias));
-            }
 
-            return Type::listOf($this->getType(substr($alias, 1, -1)));
-        }
+        return $this->baseType($alias);
+    }
 
+    private function baseType($alias)
+    {
         $type = $this->getSolution($alias);
         if (null !== $type) {
             return $type;
@@ -98,6 +95,36 @@ private function getType($alias)
         );
     }
 
+    private function wrapTypeIfNeeded($alias)
+    {
+        // Non-Null
+        if ('!' === $alias[strlen($alias) - 1]) {
+            return Type::nonNull($this->string2Type(substr($alias, 0, -1)));
+        }
+        // List
+        if ($this->hasNeedListOfWrapper($alias)) {
+            return Type::listOf($this->string2Type(substr($alias, 1, -1)));
+        }
+
+        return false;
+    }
+
+    private function hasNeedListOfWrapper($alias)
+    {
+        if ('[' === $alias[0]) {
+            $got = $alias[strlen($alias) - 1];
+            if (']' !== $got) {
+                throw new UnresolvableException(
+                    sprintf('Malformed ListOf wrapper type "%s" expected "]" but got .', $alias, json_encode($got))
+                );
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
     protected function supportedSolutionClass()
     {
         return 'GraphQL\\Type\\Definition\\Type';

Tests/Resolver/ResolverTest.php

@@ -16,23 +16,6 @@
 
 class ResolverTest extends \PHPUnit_Framework_TestCase
 {
-    private $privatePropertyWithoutGetter = 'ImNotAccessibleFromOutside:D';
-
-    private $privatePropertyWithGetter = 'IfYouWantMeUseMyGetter';
-
-    private $private_property_with_getter2 = 'IfYouWantMeUseMyGetter2';
-
-    public $name = 'public';
-
-    public $closureProperty;
-
-    public function setUp()
-    {
-        $this->closureProperty = function () {
-            return $this->privatePropertyWithoutGetter;
-        };
-    }
-
     /**
      * @param $fieldName
      * @param $source
@@ -49,30 +32,17 @@ public function testDefaultResolveFn($fieldName, $source, $expected)
 
     public function resolverProvider()
     {
+        $object = new Toto();
+
         return [
             ['key', ['key' => 'toto'], 'toto'],
             ['fake', ['coco'], null],
-            ['privatePropertyWithoutGetter', $this, null],
-            ['privatePropertyWithGetter', $this, $this->privatePropertyWithGetter],
-            ['private_property_with_getter2', $this, $this->private_property_with_getter2],
+            ['privatePropertyWithoutGetter', $object, null],
+            ['privatePropertyWithGetter', $object, Toto::PRIVATE_PROPERTY_WITH_GETTER_VALUE],
+            ['private_property_with_getter2', $object, Toto::PRIVATE_PROPERTY_WITH_GETTER2_VALUE],
             ['not_object_or_array', 'String', null],
-            ['name', $this, $this->name],
+            ['name', $object, $object->name],
         ];
     }
 
-    /**
-     * @return string
-     */
-    public function getPrivatePropertyWithGetter()
-    {
-        return $this->privatePropertyWithGetter;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrivatePropertyWithGetter2()
-    {
-        return $this->private_property_with_getter2;
-    }
 }

Tests/Resolver/Toto.php

@@ -13,6 +13,30 @@
 
 class Toto
 {
+    const PRIVATE_PROPERTY_WITH_GETTER_VALUE = 'IfYouWantMeUseMyGetter';
+    const PRIVATE_PROPERTY_WITH_GETTER2_VALUE = 'IfYouWantMeUseMyGetter2';
+
+    private $privatePropertyWithoutGetter =  'ImNotAccessibleFromOutside:D';
+    private $privatePropertyWithGetter = self::PRIVATE_PROPERTY_WITH_GETTER_VALUE;
+    private $private_property_with_getter2 = self::PRIVATE_PROPERTY_WITH_GETTER2_VALUE;
+    public $name = 'public';
+
+    /**
+     * @return string
+     */
+    public function getPrivatePropertyWithGetter()
+    {
+        return $this->privatePropertyWithGetter;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrivatePropertyWithGetter2()
+    {
+        return $this->private_property_with_getter2;
+    }
+
     public function resolve()
     {
         return func_get_args();