Change annotation attributes names

Author: Vincz

docs/annotations/annotations-reference.md

@@ -382,17 +382,17 @@ class SecretArea {
 
 This annotation applies on methods for classes tagged with the `@Provider` annotation. It indicates that the method on this class will resolve a Mutation field.  
 The corresponding GraphQL field is added to the GraphQL type(s) following the logic:
-- The type(s) specified in the `targetType` attribute of the `@Mutation` annotation if it's defined.  
+- The type(s) specified in the `targetTypes` attribute of the `@Mutation` annotation if it's defined.  
   or
-- The type(s) specified in the `targetTypeMutation` attribute of the `@Provider` annotation if it's defined.  
+- The type(s) specified in the `targetMutationTypes` attribute of the `@Provider` annotation if it's defined.  
   or
 - The root Query type of the default schema (defined in configuration at key `overblog_graphql.definitions.schema.mutation` or `overblog_graphql.definitions.schema.default.mutation`).  
 
 The class exposing the mutation(s) must be declared as a [service](https://symfony.com/doc/current/service_container.html).
 
 Optional attributes:
 
--   **targetType** : The GraphQL type(s) to attach the field to. It must be a mutation. (by default, it'll be the root Mutation type of the default schema. see [Default Schema](../definitions/schema.md#default-schema)). You can specify one or multiple target types.
+-   **targetTypes** : The GraphQL type(s) to attach the field to. It must be a mutation. (by default, it'll be the root Mutation type of the default schema. see [Default Schema](../definitions/schema.md#default-schema)). You can specify one or multiple target types.
 
 Example:
 
@@ -440,17 +440,17 @@ Optional attributes:
 
 This annotation applies on methods for classes tagged with the `@Provider` annotation. It indicates that on this class a method will resolve a Query field.  
 The corresponding GraphQL field is added to the GraphQL type(s) following the logic:
-- The type(s) specified in the `targetType` attribute of the `@Query` annotation if it's defined.  
+- The type(s) specified in the `targetTypes` attribute of the `@Query` annotation if it's defined.  
   or
-- The type(s) specified in the `targetTypeQuery` attribute of the `@Provider` annotation if it's defined.  
+- The type(s) specified in the `targetQueryTypes` attribute of the `@Provider` annotation if it's defined.  
   or
 - The root Query type of the default schema (defined in configuration at key `overblog_graphql.definitions.schema.query` or `overblog_graphql.definitions.schema.default.query`).  
 
 The class exposing the query(ies) must be declared as a [service](https://symfony.com/doc/current/service_container.html).
 
 Optional attributes:
 
--   **targetType** : The GraphQL type(s) to attach the field to (by default, it'll be the root Query type of the default schema. see [Default Schema](../definitions/schema.md#default-schema)). You can specify one or multiple target types.
+-   **targetTypes** : The GraphQL type(s) to attach the field to (by default, it'll be the root Query type of the default schema. see [Default Schema](../definitions/schema.md#default-schema)). You can specify one or multiple target types.
 
 Example:
 

src/Annotation/Mutation.php

@@ -12,10 +12,16 @@
  */
 final class Mutation extends Field
 {
+    /**
+     * @deprecated
+     * @var array<string>
+     */
+    public array $targetType;
+
     /**
      * The target types to attach this mutation to (useful when multiple schemas are allowed).
      *
      * @var array<string>
      */
-    public array $targetType;
+    public array $targetTypes;
 }

src/Annotation/Provider.php

@@ -24,12 +24,12 @@ final class Provider implements Annotation
      *
      * @var array<string>
      */
-    public array $targetTypeQuery;
+    public array $targetQueryTypes;
 
     /**
      * The default target types to attach the provider mutations to.
      *
      * @var array<string>
      */
-    public array $targetTypeMutation;
+    public array $targetMutationTypes;
 }

src/Annotation/Query.php

@@ -12,10 +12,16 @@
  */
 final class Query extends Field
 {
+    /**
+     * @deprecated
+     * @var array<string>
+     */
+    public array $targetType;
+
     /**
      * The target types to attach this query to.
      *
      * @var array<string>
      */
-    public array $targetType;
+    public array $targetTypes;
 }

src/Config/Parser/AnnotationParser.php

@@ -710,13 +710,14 @@ private static function getGraphQLFieldsFromProviders(GraphClass $graphClass, st
                     continue;
                 }
 
-                $annotationTargets = $annotation->targetType ?? null;
+                // TODO: Remove old property check in 1.1
+                $annotationTargets = $annotation->targetTypes ?? $annotation->targetType ?? null;
 
                 if (null === $annotationTargets) {
-                    if ($annotation instanceof GQL\Mutation && isset($providerAnnotation->targetTypeMutation)) {
-                        $annotationTargets = $providerAnnotation->targetTypeMutation;
-                    } elseif ($annotation instanceof GQL\Query && isset($providerAnnotation->targetTypeQuery)) {
-                        $annotationTargets = $providerAnnotation->targetTypeQuery;
+                    if ($annotation instanceof GQL\Mutation && isset($providerAnnotation->targetMutationTypes)) {
+                        $annotationTargets = $providerAnnotation->targetMutationTypes;
+                    } elseif ($annotation instanceof GQL\Query && isset($providerAnnotation->targetQueryTypes)) {
+                        $annotationTargets = $providerAnnotation->targetQueryTypes;
                     }
                 }
 

tests/Config/Parser/fixtures/annotations/Repository/PlanetRepository.php

@@ -45,15 +45,15 @@ public function getAllowedPlanetsForDroids(): array
     }
 
     /**
-     * @GQL\Query(type="Planet", targetType="RootQuery2")
+     * @GQL\Query(type="Planet", targetTypes="RootQuery2")
      */
     public function getPlanetSchema2(): ?Planet
     {
         return null;
     }
 
     /**
-     * @GQL\Mutation(type="Planet", targetType="RootMutation2", args={
+     * @GQL\Mutation(type="Planet", targetTypes="RootMutation2", args={
      *    @GQL\Arg(type="PlanetInput!", name="planetInput")
      * })
      * @GQL\IsPublic("override_public")
@@ -64,23 +64,23 @@ public function createPlanetSchema2(array $planetInput): array
     }
 
     /**
-     * @GQL\Mutation(targetType={"RootMutation", "RootMutation2"})
+     * @GQL\Mutation(targetTypes={"RootMutation", "RootMutation2"})
      */
     public function destroyPlanet(int $planetId): bool
     {
         return true;
     }
 
     /**
-     * @GQL\Query(targetType={"RootQuery", "RootQuery2"})
+     * @GQL\Query(targetTypes={"RootQuery", "RootQuery2"})
      */
     public function isPlanetDestroyed(int $planetId): bool
     {
         return true;
     }
 
     /**
-     * @GQL\Query(targetType={"Droid", "Mandalorian"}, name="armorResistance")
+     * @GQL\Query(targetTypes={"Droid", "Mandalorian"}, name="armorResistance")
      */
     public function getArmorResistance(): int
     {

tests/Config/Parser/fixtures/annotations/Repository/WeaponRepository.php

@@ -7,7 +7,7 @@
 use Overblog\GraphQLBundle\Annotation as GQL;
 
 /**
- * @GQL\Provider(targetTypeQuery={"RootQuery2"}, targetTypeMutation="RootMutation2")
+ * @GQL\Provider(targetQueryTypes={"RootQuery2"}, targetMutationTypes="RootMutation2")
  */
 class WeaponRepository
 {
@@ -20,7 +20,7 @@ public function hasSecretWeapons(): bool
     }
 
     /**
-     * @GQL\Query(targetType="RootQuery")
+     * @GQL\Query(targetTypes="RootQuery")
      */
     public function countSecretWeapons(): int
     {