Merge branch 'master' into patch-1

Vincz · web-flow · commit bd9c5410059d · 2024-03-05T15:33:37.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           tools: flex
-          php-version: "8.1"
+          php-version: "8.2"
           coverage: "none"
 
       - name: "Install dependencies"
diff --git a/composer.json b/composer.json
@@ -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.17.0/php-cs-fixer.phar -O php-cs-fixer.phar",
+        "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/download/v3.48.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"
diff --git a/src/Config/TypeDefinition.php b/src/Config/TypeDefinition.php
@@ -81,6 +81,7 @@ protected function validationSection(int $level): ArrayNodeDefinition
                                 return $value;
                             }
                         }
+
                         // validation: [list of constraints]
                         return ['constraints' => $value];
                     }
diff --git a/src/Controller/ProfilerController.php b/src/Controller/ProfilerController.php
@@ -6,6 +6,7 @@
 
 use GraphQL\Utils\SchemaPrinter;
 use Overblog\GraphQLBundle\Request\Executor as RequestExecutor;
+use Overblog\GraphQLBundle\Resolver\TypeResolver;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -24,14 +25,16 @@ final class ProfilerController
     private ?Profiler $profiler;
     private ?Environment $twig;
     private string $endpointUrl;
+    private TypeResolver $typeResolver;
     private RequestExecutor $requestExecutor;
     private ?string $queryMatch;
 
-    public function __construct(?Profiler $profiler, ?Environment $twig, RouterInterface $router, RequestExecutor $requestExecutor, ?string $queryMatch)
+    public function __construct(?Profiler $profiler, ?Environment $twig, RouterInterface $router, TypeResolver $typeResolver, RequestExecutor $requestExecutor, ?string $queryMatch)
     {
         $this->profiler = $profiler;
         $this->twig = $twig;
         $this->endpointUrl = $router->generate('overblog_graphql_endpoint');
+        $this->typeResolver = $typeResolver;
         $this->requestExecutor = $requestExecutor;
         $this->queryMatch = $queryMatch;
     }
@@ -69,9 +72,11 @@ public function __invoke(Request $request, string $token): Response
         }, $this->profiler->find(null, $this->queryMatch ?: $this->endpointUrl, $limit, 'POST', null, null, null)); // @phpstan-ignore-line
 
         $schemas = [];
+        $this->typeResolver->setIgnoreUnresolvableException(true);
         foreach ($this->requestExecutor->getSchemasNames() as $schemaName) {
             $schemas[$schemaName] = SchemaPrinter::doPrint($this->requestExecutor->getSchema($schemaName));
         }
+        $this->typeResolver->setIgnoreUnresolvableException(false);
 
         return new Response($this->twig->render('@OverblogGraphQL/profiler/graphql.html.twig', [
             'request' => $request,
diff --git a/src/Relay/Connection/ConnectionInterface.php b/src/Relay/Connection/ConnectionInterface.php
@@ -27,8 +27,6 @@ public function setEdges(iterable $edges): void;
 
     /**
      * Get the page info.
-     *
-     * @return PageInfoInterface
      */
     public function getPageInfo(): ?PageInfoInterface;
 
diff --git a/src/Relay/Connection/Output/PageInfo.php b/src/Relay/Connection/Output/PageInfo.php
@@ -23,9 +23,6 @@ public function __construct(string $startCursor = null, string $endCursor = null
         $this->hasNextPage = $hasNextPage;
     }
 
-    /**
-     * @return string
-     */
     public function getStartCursor(): ?string
     {
         return $this->startCursor;
@@ -36,9 +33,6 @@ public function setStartCursor(string $startCursor): void
         $this->startCursor = $startCursor;
     }
 
-    /**
-     * @return string
-     */
     public function getEndCursor(): ?string
     {
         return $this->endCursor;
@@ -49,9 +43,6 @@ public function setEndCursor(string $endCursor): void
         $this->endCursor = $endCursor;
     }
 
-    /**
-     * @return bool
-     */
     public function getHasPreviousPage(): ?bool
     {
         return $this->hasPreviousPage;
@@ -62,9 +53,6 @@ public function setHasPreviousPage(bool $hasPreviousPage): void
         $this->hasPreviousPage = $hasPreviousPage;
     }
 
-    /**
-     * @return bool
-     */
     public function getHasNextPage(): ?bool
     {
         return $this->hasNextPage;
diff --git a/src/Relay/Connection/PageInfoInterface.php b/src/Relay/Connection/PageInfoInterface.php
@@ -12,30 +12,18 @@
 
 interface PageInfoInterface
 {
-    /**
-     * @return string
-     */
     public function getStartCursor(): ?string;
 
     public function setStartCursor(string $startCursor): void;
 
-    /**
-     * @return string
-     */
     public function getEndCursor(): ?string;
 
     public function setEndCursor(string $endCursor): void;
 
-    /**
-     * @return bool
-     */
     public function getHasPreviousPage(): ?bool;
 
     public function setHasPreviousPage(bool $hasPreviousPage): void;
 
-    /**
-     * @return bool
-     */
     public function getHasNextPage(): ?bool;
 
     public function setHasNextPage(bool $hasNextPage): void;
diff --git a/src/Resolver/TypeResolver.php b/src/Resolver/TypeResolver.php
@@ -46,8 +46,6 @@ protected function onLoadSolution($solution): void
 
     /**
      * @param string $alias
-     *
-     * @return Type
      */
     public function resolve($alias): ?Type
     {
diff --git a/src/Resources/config/profiler.yaml b/src/Resources/config/profiler.yaml
@@ -5,6 +5,7 @@ services:
             - "@?profiler"
             - "@?twig"
             - "@router"
+            - '@Overblog\GraphQLBundle\Resolver\TypeResolver'
             - '@Overblog\GraphQLBundle\Request\Executor'
             - "%overblog_graphql.profiler.query_match%"
 
diff --git a/src/Upload/Type/GraphQLUploadType.php b/src/Upload/Type/GraphQLUploadType.php
@@ -14,9 +14,6 @@
 
 final class GraphQLUploadType extends ScalarType
 {
-    /**
-     * @param string $name
-     */
     public function __construct(string $name = null)
     {
         parent::__construct([
diff --git a/src/Validator/InputValidator.php b/src/Validator/InputValidator.php
@@ -63,7 +63,7 @@ public function __construct(
     /**
      * @throws ArgumentsValidationException
      */
-    public function validate(string|array|null $groups = null, bool $throw = true): ?ConstraintViolationListInterface
+    public function validate(string|array $groups = null, bool $throw = true): ?ConstraintViolationListInterface
     {
         $rootNode = new ValidationNode(
             $this->info->parentType,
diff --git a/tests/Config/Parser/fixtures/graphql/schema.php b/tests/Config/Parser/fixtures/graphql/schema.php
@@ -159,9 +159,9 @@
         'type' => 'custom-scalar',
         'config' => [
             'description' => null,
-            'serialize' => [\Overblog\GraphQLBundle\Config\Parser\GraphQL\ASTConverter\CustomScalarNode::class, 'mustOverrideConfig'],
-            'parseValue' => [\Overblog\GraphQLBundle\Config\Parser\GraphQL\ASTConverter\CustomScalarNode::class, 'mustOverrideConfig'],
-            'parseLiteral' => [\Overblog\GraphQLBundle\Config\Parser\GraphQL\ASTConverter\CustomScalarNode::class, 'mustOverrideConfig'],
+            'serialize' => [Overblog\GraphQLBundle\Config\Parser\GraphQL\ASTConverter\CustomScalarNode::class, 'mustOverrideConfig'],
+            'parseValue' => [Overblog\GraphQLBundle\Config\Parser\GraphQL\ASTConverter\CustomScalarNode::class, 'mustOverrideConfig'],
+            'parseLiteral' => [Overblog\GraphQLBundle\Config\Parser\GraphQL\ASTConverter\CustomScalarNode::class, 'mustOverrideConfig'],
         ],
     ],
 ];
diff --git a/tests/Controller/ProfilerControllerTest.php b/tests/Controller/ProfilerControllerTest.php
@@ -8,6 +8,7 @@
 use Overblog\GraphQLBundle\Controller\ProfilerController;
 use Overblog\GraphQLBundle\DataCollector\GraphQLCollector;
 use Overblog\GraphQLBundle\Request\Executor;
+use Overblog\GraphQLBundle\Resolver\TypeResolver;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -45,6 +46,17 @@ protected function getMockExecutor(bool $expected = true): Executor
         return $executor;
     }
 
+    /**
+     * @return TypeResolver&MockObject
+     */
+    protected function getMockTypeResolver(int $expected = 2): TypeResolver
+    {
+        $typeGenerator = $this->getMockBuilder(TypeResolver::class)->disableOriginalConstructor()->onlyMethods(['setIgnoreUnresolvableException'])->getMock();
+        $typeGenerator->expects($this->exactly($expected))->method('setIgnoreUnresolvableException');
+
+        return $typeGenerator;
+    }
+
     /**
      * @return Profiler&MockObject
      */
@@ -58,7 +70,7 @@ protected function getMockProfiler(): Profiler
 
     public function testInvokeWithoutProfiler(): void
     {
-        $controller = new ProfilerController(null, null, $this->getMockRouter(), $this->getMockExecutor(false), null);
+        $controller = new ProfilerController(null, null, $this->getMockRouter(), $this->getMockTypeResolver(0), $this->getMockExecutor(false), null);
 
         $this->expectException(ServiceNotFoundException::class);
         $this->expectExceptionMessage('The profiler must be enabled.');
@@ -67,7 +79,7 @@ public function testInvokeWithoutProfiler(): void
 
     public function testInvokeWithoutTwig(): void
     {
-        $controller = new ProfilerController($this->getMockProfiler(), null, $this->getMockRouter(), $this->getMockExecutor(false), null);
+        $controller = new ProfilerController($this->getMockProfiler(), null, $this->getMockRouter(), $this->getMockTypeResolver(0), $this->getMockExecutor(false), null);
 
         $this->expectException(ServiceNotFoundException::class);
         $this->expectExceptionMessage('The GraphQL Profiler require twig');
@@ -79,10 +91,11 @@ public function testWithToken(): void
         $profilerMock = $this->getMockProfiler();
         $executorMock = $this->getMockExecutor();
         $routerMock = $this->getMockRouter();
+        $typeGeneratorMock = $this->getMockTypeResolver();
 
         /** @var Environment&MockObject $twigMock */
         $twigMock = $this->getMockBuilder(Environment::class)->disableOriginalConstructor()->onlyMethods(['render'])->getMock();
-        $controller = new ProfilerController($profilerMock, $twigMock, $routerMock, $executorMock, null);
+        $controller = new ProfilerController($profilerMock, $twigMock, $routerMock, $typeGeneratorMock, $executorMock, null);
 
         /** @var Profiler&MockObject $profilerMock */
         $profilerMock->expects($this->once())->method('disable');

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ protected function validationSection(int $level): ArrayNodeDefinition`
`81`	`81`	`return $value;`
`82`	`82`	`}`
`83`	`83`	`}`
	`84`	`+`
`84`	`85`	`// validation: [list of constraints]`
`85`	`86`	`return ['constraints' => $value];`
`86`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,6 @@ public function __construct(string $startCursor = null, string $endCursor = null`
`23`	`23`	`$this->hasNextPage = $hasNextPage;`
`24`	`24`	`}`
`25`	`25`
`26`		`- /**`
`27`		`- * @return string`
`28`		`- */`
`29`	`26`	`public function getStartCursor(): ?string`
`30`	`27`	`{`
`31`	`28`	`return $this->startCursor;`
`@@ -36,9 +33,6 @@ public function setStartCursor(string $startCursor): void`
`36`	`33`	`$this->startCursor = $startCursor;`
`37`	`34`	`}`
`38`	`35`
`39`		`- /**`
`40`		`- * @return string`
`41`		`- */`
`42`	`36`	`public function getEndCursor(): ?string`
`43`	`37`	`{`
`44`	`38`	`return $this->endCursor;`
`@@ -49,9 +43,6 @@ public function setEndCursor(string $endCursor): void`
`49`	`43`	`$this->endCursor = $endCursor;`
`50`	`44`	`}`
`51`	`45`
`52`		`- /**`
`53`		`- * @return bool`
`54`		`- */`
`55`	`46`	`public function getHasPreviousPage(): ?bool`
`56`	`47`	`{`
`57`	`48`	`return $this->hasPreviousPage;`
`@@ -62,9 +53,6 @@ public function setHasPreviousPage(bool $hasPreviousPage): void`
`62`	`53`	`$this->hasPreviousPage = $hasPreviousPage;`
`63`	`54`	`}`
`64`	`55`
`65`		`- /**`
`66`		`- * @return bool`
`67`		`- */`
`68`	`56`	`public function getHasNextPage(): ?bool`
`69`	`57`	`{`
`70`	`58`	`return $this->hasNextPage;`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ protected function onLoadSolution($solution): void`
`46`	`46`
`47`	`47`	`/**`
`48`	`48`	`* @param string $alias`
`49`		`- *`
`50`		`- * @return Type`
`51`	`49`	`*/`
`52`	`50`	`public function resolve($alias): ?Type`
`53`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,6 @@`
`14`	`14`
`15`	`15`	`final class GraphQLUploadType extends ScalarType`
`16`	`16`	`{`
`17`		`- /**`
`18`		`- * @param string $name`
`19`		`- */`
`20`	`17`	`public function __construct(string $name = null)`
`21`	`18`	`{`
`22`	`19`	`parent::__construct([`