Merge pull request #1122 from sparklink-pro/master

Update webonyx / Cleanup / Fix tests

Author: Vincz

.github/workflows/ci.yml

@@ -18,14 +18,19 @@ jobs:
         php-version:
           - '8.0'
           - '8.1'
+          - '8.2'
         symfony-version:
           - '5.4.*'
           - '6.0.*'
+          - '6.2.*'
         dependencies:
           - 'lowest'
           - 'highest'
         remove-dependencies: [ '' ]
         coverage: [ 'none' ]
+        exclude:
+          - php-version: '8.0'
+            symfony-version: '6.2.*'
         include:
           - php-version: '8.0'
             symfony-version: '5.4.*'

composer.json

@@ -44,7 +44,7 @@
         "symfony/http-kernel": "^5.4 || ^6.0",
         "symfony/options-resolver": "^5.4 || ^6.0",
         "symfony/property-access": "^5.4 || ^6.0",
-        "webonyx/graphql-php": "^15.0"
+        "webonyx/graphql-php": "^15.4"
     },
     "suggest": {
         "nelmio/cors-bundle": "For more flexibility when using CORS prefight",
@@ -91,7 +91,7 @@
         "static-analysis": [
             "phpstan analyse --ansi --memory-limit=1G"
         ],
-        "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.11.0/php-cs-fixer.phar -O php-cs-fixer.phar",
+        "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.17.0/php-cs-fixer.phar -O php-cs-fixer.phar",
         "fix-cs": [
             "@install-cs",
             "@php php-cs-fixer.phar fix --diff -v --allow-risky=yes --ansi"

phpstan-baseline.neon

@@ -387,7 +387,7 @@ parameters:
 
 		-
 			message: "#^Call to method disableOriginalConstructor\\(\\) on an unknown class PHPUnit_Framework_MockObject_MockBuilder\\.$#"
-			count: 1
+			count: 2
 			path: tests/ExpressionLanguage/TestCase.php
 
 		-

src/Command/GraphQLDumpSchemaCommand.php

@@ -8,6 +8,7 @@
 use GraphQL\Utils\SchemaPrinter;
 use InvalidArgumentException;
 use Overblog\GraphQLBundle\Request\Executor as RequestExecutor;
+use Overblog\GraphQLBundle\Resolver\TypeResolver;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -27,11 +28,14 @@ final class GraphQLDumpSchemaCommand extends Command
     private RequestExecutor $requestExecutor;
     private string $baseExportPath;
 
-    public function __construct(string $baseExportPath, RequestExecutor $requestExecutor)
+    public function __construct(string $baseExportPath, RequestExecutor $requestExecutor, TypeResolver $typeResolver)
     {
         parent::__construct();
         $this->baseExportPath = $baseExportPath;
         $this->requestExecutor = $requestExecutor;
+
+        // Disable exception when an unresolvable types is encoutered. Schema dump will try to access the Query, Mutation and Subscription types and will fail if they are not defined.
+        $typeResolver->setIgnoreUnresolvableException(true);
     }
 
     public function getRequestExecutor(): RequestExecutor

src/Definition/Builder/SchemaBuilder.php

@@ -23,7 +23,7 @@ public function __construct(TypeResolver $typeResolver, bool $enableValidation =
         $this->enableValidation = $enableValidation;
     }
 
-    public function getBuilder(string $name, ?string $queryAlias, ?string $mutationAlias = null, ?string $subscriptionAlias = null, array $types = []): Closure
+    public function getBuilder(string $name, ?string $queryAlias, string $mutationAlias = null, string $subscriptionAlias = null, array $types = []): Closure
     {
         return function () use ($name, $queryAlias, $mutationAlias, $subscriptionAlias, $types): ExtensibleSchema {
             static $schema = null;
@@ -38,7 +38,7 @@ public function getBuilder(string $name, ?string $queryAlias, ?string $mutationA
     /**
      * @param string[] $types
      */
-    public function create(string $name, ?string $queryAlias, ?string $mutationAlias = null, ?string $subscriptionAlias = null, array $types = []): ExtensibleSchema
+    public function create(string $name, ?string $queryAlias, string $mutationAlias = null, string $subscriptionAlias = null, array $types = []): ExtensibleSchema
     {
         $this->typeResolver->setCurrentSchemaName($name);
         $query = $this->typeResolver->resolve($queryAlias);

src/Definition/Type/PhpEnumType.php

@@ -93,7 +93,7 @@ public function parseValue($value): mixed
         return parent::parseValue($value);
     }
 
-    public function parseLiteral(Node $valueNode, ?array $variables = null): mixed
+    public function parseLiteral(Node $valueNode, array $variables = null): mixed
     {
         if ($this->enumClass) {
             if (!$valueNode instanceof EnumValueNode) {

src/Executor/Executor.php

@@ -28,8 +28,8 @@ public function execute(
         $contextValue = null,
         $variableValues = null,
         $operationName = null,
-        ?callable $fieldResolver = null,
-        ?array $validationRules = null
+        callable $fieldResolver = null,
+        array $validationRules = null
     ): ExecutionResult {
         if (!method_exists($promiseAdapter, 'wait')) {
             throw new RuntimeException(

src/Executor/ExecutorInterface.php

@@ -25,7 +25,7 @@ public function execute(
         $contextValue = null,
         $variableValues = null,
         $operationName = null,
-        ?callable $fieldResolver = null,
-        ?array $validationRules = null
+        callable $fieldResolver = null,
+        array $validationRules = null
     ): ExecutionResult;
 }

src/ExpressionLanguage/ExpressionFunction.php

@@ -12,7 +12,7 @@ class ExpressionFunction extends BaseExpressionFunction
 {
     protected string $gqlServices = '$'.TypeGenerator::GRAPHQL_SERVICES;
 
-    public function __construct(string $name, callable $compiler, ?callable $evaluator = null)
+    public function __construct(string $name, callable $compiler, callable $evaluator = null)
     {
         if (null === $evaluator) {
             $evaluator = new EvaluatorIsNotAllowedException($name);

src/Generator/TypeBuilder.php

@@ -449,7 +449,7 @@ private function buildScalarCallback($callback, string $fieldName)
      *
      * @throws GeneratorException
      */
-    private function buildResolve($resolve, ?array $groups = null): GeneratorInterface
+    private function buildResolve($resolve, array $groups = null): GeneratorInterface
     {
         if (is_callable($resolve) && is_array($resolve)) {
             return Collection::numeric($resolve);