Fix profiler & update phpcs

Author: Vincz

Diff for: 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 for: 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 for: 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 for: tests/Controller/ProfilerControllerTest.php

@@ -7,7 +7,9 @@
 use GraphQL\Type\Schema;
 use Overblog\GraphQLBundle\Controller\ProfilerController;
 use Overblog\GraphQLBundle\DataCollector\GraphQLCollector;
+use Overblog\GraphQLBundle\Generator\TypeGenerator;
 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 +47,17 @@ protected function getMockExecutor(bool $expected = true): Executor
         return $executor;
     }
 
+    /**
+     * @return TypeGenerator&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 +71,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 +80,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 +92,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');