Try to get property before using PropertyAccessor

Author: Jeremiah VALERIE

Resolver/Resolver.php

@@ -27,18 +27,39 @@ public static function defaultResolveFn($source, $args, ResolveInfo $info)
         $fieldName = $info->fieldName;
         $property = null;
 
-        if (null === self::$accessor) {
-            self::$accessor = PropertyAccess::createPropertyAccessor();
-        }
-
         $index = sprintf('[%s]', $fieldName);
 
-        if (self::$accessor->isReadable($source, $index)) {
-            $property = self::$accessor->getValue($source, $index);
-        } elseif (self::$accessor->isReadable($source, $fieldName)) {
-            $property = self::$accessor->getValue($source, $fieldName);
+        if (self::getAccessor()->isReadable($source, $index)) {
+            $property = self::getAccessor()->getValue($source, $index);
+        } elseif (is_object($source)) {
+            $property = self::propertyValueFromObject($source, $fieldName);
         }
 
         return $property instanceof \Closure ? $property($source, $args, $info) : $property;
     }
+
+    private static function propertyValueFromObject($object, $fieldName)
+    {
+        $property = 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);
+        }
+
+        return $property;
+    }
+
+    private static function getAccessor()
+    {
+        if (null === self::$accessor) {
+            self::$accessor = PropertyAccess::createPropertyAccessor();
+        }
+
+        return self::$accessor;
+    }
 }

Tests/Resolver/ResolverTest.php

@@ -22,7 +22,7 @@ class ResolverTest extends \PHPUnit_Framework_TestCase
 
     private $private_property_with_getter2 = 'IfYouWantMeUseMyGetter2';
 
-    public $public = 'public';
+    public $name = 'public';
 
     public $closureProperty;
 
@@ -56,7 +56,7 @@ public function resolverProvider()
             ['privatePropertyWithGetter', $this, $this->privatePropertyWithGetter],
             ['private_property_with_getter2', $this, $this->private_property_with_getter2],
             ['not_object_or_array', 'String', null],
-            ['public', $this, $this->public],
+            ['name', $this, $this->name],
         ];
     }