Add deprecations

Author: murtukov

UPGRADE-1.0.md

@@ -40,7 +40,7 @@ $connectionBuilder = new ConnectionBuilder(
 ### Change arguments of `TypeGenerator` class
 
 The `Overblog\GraphQLBundle\Generator\TypeGenerator` service is used internally for GraphQL types compilation. If you 
-overridden the service definition, please take into account the new constructor signature:
+overrode the service definition, please take into account the new constructor signature:
 
 ```diff
 public function __construct(
@@ -104,31 +104,33 @@ If you have any services tagged with `overblog_graphql.global_variable`, they sh
 `overblog_graphql.graphql_service` instead.
 
 
-## Change `resolver` expression function
+### Change `resolver` expression function
 
 The signature of the `resolver` expression function has been changed. 
 
 Old signature (deprecated): <code><b>resolver</b>(string <b>$alias</b>, array <b>$args</b> = []): mixed</code>  
 New signature: <code><b>query</b>(string <b>$alias</b>, <b>...$args</b>): mixed</code>
 
-Example of the function call to be changed:
+Example:
 ```diff
 - resolver('get_posts', [args, info, value])
 + query('get_posts', args, info, value)
 ```
 
 
-## Rename `ResolverInterface` to `QueryInterface`
+### Rename `ResolverInterface` to `QueryInterface`
 
 The `Overblog\GraphQLBundle\Definition\Resolver\ResolverInterface` interface is deprecated. Use 
 `Overblog\GraphQLBundle\Definition\Resolver\QueryInterface` instead.
 
 Example:
 ```diff
 - use Overblog\GraphQLBundle\Definition\Resolver\ResolverInterface;
--
-- class UserResolver implements ResolverInterface
 + use Overblog\GraphQLBundle\Definition\Resolver\QueryInterface;
-+
+
+- class UserResolver implements ResolverInterface
 + class UserQuery implements QueryInterface
+{
+    // ...
+}
 ```

src/Definition/GraphQLServices.php

@@ -66,6 +66,11 @@ public function query(string $alias, ...$args)
      */
     public function mutation(string $alias, ...$args)
     {
+        // TODO: remove the following if-block in 1.0
+        if (count($args) === 1 && is_array($args[0])) {
+            $args = $args[0];
+        }
+
         return $this->mutationResolver->resolve([$alias, $args]);
     }
 

src/Definition/Resolver/ResolverInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Overblog\GraphQLBundle\Definition\Resolver;
+
+/**
+ * @deprecated This interface is deprecated since 0.14 and will be removed in 1.0. Use Overblog\GraphQLBundle\Definition\Resolver\QueryInterface instead.
+ */
+interface ResolverInterface
+{
+}

src/ExpressionLanguage/ExpressionFunction/GraphQL/Mutation.php

@@ -15,7 +15,22 @@ public function __construct($name = self::NAME)
         parent::__construct(
             $name,
             function (string $alias, ...$args) {
-                $args = count($args) > 0 ? ', '.join(', ', $args) : '';
+                $count = count($args);
+
+                // TODO: remove the following if-else-block in 1.0
+                if ($count === 1 && '$' !== $args[0][0]) {
+                    trigger_error(
+                        "The signature of the 'mutation' expression function has been changed. Use a variable-length argument list, instead of a signle array argument. For more info visit: https://github.com/overblog/GraphQLBundle/issues/775",
+                        E_USER_DEPRECATED
+                    );
+
+                    $args = ', '.$args[0];
+                } else {
+                    $args = $count > 0 ? ', '.join(', ', $args) : '';
+                }
+
+                // TODO: uncomment the following line in 1.0
+                // $args = $count > 0 ? ', '.join(', ', $args) : '';
 
                 return "$this->gqlServices->mutation({$alias}{$args})";
             }

src/ExpressionLanguage/ExpressionFunction/GraphQL/Resolver.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL;
+
+use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction;
+
+/**
+ * @deprecated This class has been deprecated since 0.14 and will be removed in 1.0. Use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL\Query instead.
+ */
+final class Resolver extends ExpressionFunction
+{
+    public function __construct($name = 'resolver')
+    {
+        parent::__construct(
+            $name,
+            function (string $alias, string $args = '[]') {
+                trigger_error(
+                    "The expression function 'resolver' has been deprecated since 0.14 and will be removed in 1.0. Use 'query' instead. For more info visit: https://github.com/overblog/GraphQLBundle/issues/775",
+                    E_USER_DEPRECATED
+                );
+
+                return "$this->gqlServices->query($alias, ...$args)";
+            }
+        );
+    }
+}

src/Resources/config/expression_language_functions.yaml

@@ -27,3 +27,8 @@ services:
     expression_function.query_alias:
         class: Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL\Query
         arguments: { $name : 'q' }
+
+    # Deprecated. To be removed in 1.0
+    expression_function.resolver_alias:
+        class: Overblog\GraphQLBundle\ExpressionLanguage\ExpressionFunction\GraphQL\Query
+        arguments: { $name : 'res' }

tests/Functional/App/config/validator/mapping/Mutation.types.yml

@@ -15,7 +15,7 @@ Mutation:
 
             simpleValidation:
                 type: Boolean
-                resolve: "@=mut('mutation_mock', args, validator)"
+                resolve: "@=mut('mutation_mock', [args, validator])"
                 args:
                     username:
                         type: String!

tests/Functional/Security/AccessTest.php

@@ -67,7 +67,7 @@ public function setUp(): void
     public function testCustomClassLoaderNotRegister(): void
     {
         $this->expectException(Error::class);
-        $this->expectExceptionMessage('Class \'Overblog\GraphQLBundle\Access\__DEFINITIONS__\RootQueryType\' not found');
+        $this->expectExceptionMessage('Class "Overblog\GraphQLBundle\Access\__DEFINITIONS__\RootQueryType" not found');
         spl_autoload_unregister($this->loader);
         $this->assertResponse($this->userNameQuery, [], static::ANONYMOUS_USER, 'access');
     }