Merge pull request #727 from mcg-web/fix-resolver-field

Fix resolver field with same property/method name

Author: mcg-web

src/Resolver/FieldResolver.php

@@ -26,6 +26,8 @@ public static function valueFromObjectOrArray($objectOrArray, $fieldName)
                 $value = $objectOrArray->$getter();
             } elseif (null !== $getter = self::guessObjectMethod($objectOrArray, $fieldName, 'is')) {
                 $value = $objectOrArray->$getter();
+            } elseif (null !== $getter = self::guessObjectMethod($objectOrArray, $fieldName, '')) {
+                $value = $objectOrArray->$getter();
             } elseif (isset($objectOrArray->$fieldName)) {
                 $value = $objectOrArray->$fieldName;
             }

tests/Resolver/ResolverFieldTest.php

@@ -39,6 +39,7 @@ public function resolverProvider()
             ['not_object_or_array', 'String', null],
             ['name', $object, $object->name],
             ['enabled', $object, $object->isEnabled()],
+            ['isDisabled', $object, $object->isDisabled()],
         ];
     }
 }

tests/Resolver/Toto.php

@@ -15,6 +15,7 @@ class Toto
     private $private_property_with_getter2 = self::PRIVATE_PROPERTY_WITH_GETTER2_VALUE;
     public $name = 'public';
     private $enabled = true;
+    private $isDisabled = false;
 
     /**
      * @return string
@@ -51,4 +52,12 @@ public function isEnabled()
     {
         return $this->enabled;
     }
+
+    /**
+     * @return bool
+     */
+    public function isDisabled()
+    {
+        return $this->isDisabled;
+    }
 }