Merge branch 'master' into multiple-targetType

Author: Vincz

UPGRADE-0.13.md

@@ -23,7 +23,7 @@ The new `default_field_resolver` config entry accepts callable service id.
 Stop using internally `symfony/property-access` package
 since it was a bottleneck to performance for large schema.
 
-Array access and camelize getter are supported but isser, hasser,
+Array access and camelize getter/isser are supported but hasser,
 jQuery style (e.g. `last()`) and "can" property accessors
 are no more supported out-of-the-box,
 please implement a custom resolver if these accessors are needed.

src/Config/Parser/AnnotationParser.php

@@ -511,8 +511,8 @@ private static function getTypeFieldConfigurationFromReflector(GraphClass $graph
         if (!empty($fieldAnnotation->args)) {
             foreach ($fieldAnnotation->args as $arg) {
                 $args[$arg->name] = ['type' => $arg->type]
-                    + ($arg->description ? ['description' => $arg->description] : [])
-                    + ($arg->default ? ['defaultValue' => $arg->default] : []);
+                    + (null !== $arg->description ? ['description' => $arg->description] : [])
+                    + (null !== $arg->default ? ['defaultValue' => $arg->default] : []);
             }
         } elseif ($reflector instanceof ReflectionMethod) {
             $args = self::guessArgs($reflector);
@@ -750,6 +750,28 @@ private static function getDescriptionConfiguration(array $annotations, bool $wi
         return $config;
     }
 
+    /**
+     * Get args config from an array of @Arg annotation or by auto-guessing if a method is provided.
+     *
+     * @param array            $args
+     * @param ReflectionMethod $method
+     */
+    private static function getArgs(array $args = null, ReflectionMethod $method = null): array
+    {
+        $config = [];
+        if ($args && !empty($args)) {
+            foreach ($args as $arg) {
+                $config[$arg->name] = ['type' => $arg->type]
+                    + ($arg->description ? ['description' => $arg->description] : [])
+                    + ($arg->default ? ['defaultValue' => $arg->default] : []);
+            }
+        } elseif ($method) {
+            $config = self::guessArgs($method);
+        }
+
+        return $config;
+    }
+
     /**
      * Format an array of args to a list of arguments in an expression.
      */

src/Resolver/FieldResolver.php

@@ -42,6 +42,8 @@ public static function valueFromObjectOrArray($objectOrArray, string $fieldName)
         } elseif (is_object($objectOrArray)) {
             if (null !== $getter = self::guessObjectMethod($objectOrArray, $fieldName, 'get')) {
                 $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)) {

tests/Config/Parser/AnnotationParserTest.php

@@ -135,7 +135,7 @@ public function testTypes(): void
                 'currentMaster' => ['type' => 'Sith', 'resolve' => "@=service('master_resolver').getMaster(value)"],
                 'victims' => [
                     'type' => '[Character]',
-                    'args' => ['jediOnly' => ['type' => 'Boolean', 'description' => 'Only Jedi victims']],
+                    'args' => ['jediOnly' => ['type' => 'Boolean', 'description' => 'Only Jedi victims', 'defaultValue' => false]],
                     'resolve' => '@=call(value.getVictims, arguments({jediOnly: "Boolean"}, args))',
                 ],
             ],

tests/Resolver/ResolverFieldTest.php

@@ -13,9 +13,10 @@ class ResolverFieldTest extends TestCase
     /**
      * @dataProvider resolverProvider
      *
-     * @param mixed $source
+     * @param mixed            $source
+     * @param bool|string|null $expected
      */
-    public function testDefaultFieldResolveFn(string $fieldName, $source, ?string $expected): void
+    public function testDefaultFieldResolveFn(string $fieldName, $source, $expected): void
     {
         $info = $this->getMockBuilder(ResolveInfo::class)->disableOriginalConstructor()->getMock();
         $info->fieldName = $fieldName;
@@ -36,6 +37,8 @@ public function resolverProvider(): array
             ['private_property_with_getter2', $object, Toto::PRIVATE_PROPERTY_WITH_GETTER2_VALUE],
             ['not_object_or_array', 'String', null],
             ['name', $object, $object->name],
+            ['enabled', $object, $object->isEnabled()],
+            ['isDisabled', $object, $object->isDisabled()],
         ];
     }
 }

tests/Resolver/Toto.php

@@ -17,6 +17,8 @@ class Toto
     private string $privatePropertyWithGetter = self::PRIVATE_PROPERTY_WITH_GETTER_VALUE;
     private string $private_property_with_getter2 = self::PRIVATE_PROPERTY_WITH_GETTER2_VALUE;
     public string $name = 'public';
+    private bool $enabled = true;
+    private bool $isDisabled = false;
 
     public function getPrivatePropertyWithGetter(): string
     {
@@ -39,4 +41,14 @@ public function resolve(): array
     {
         return func_get_args();
     }
+
+    public function isEnabled(): bool
+    {
+        return $this->enabled;
+    }
+
+    public function isDisabled(): bool
+    {
+        return $this->isDisabled;
+    }
 }