Merge branch 'master' into patch-1

Vincz · web-flow · commit 6e9f3813a720 · 2024-02-01T16:24:32.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,10 +19,13 @@ jobs:
           - '8.0'
           - '8.1'
           - '8.2'
+          - '8.3'
         symfony-version:
           - '5.4.*'
           - '6.0.*'
           - '6.2.*'
+          - '6.4.*'
+          - '7.0.*'
         dependencies:
           - 'lowest'
           - 'highest'
@@ -31,6 +34,12 @@ jobs:
         exclude:
           - php-version: '8.0'
             symfony-version: '6.2.*'
+          - php-version: '8.0'
+            symfony-version: '6.4.*'
+          - php-version: '8.0'
+            symfony-version: '7.0.*'
+          - php-version: '8.1'
+            symfony-version: '7.0.*'
         include:
           - php-version: '8.0'
             symfony-version: '5.4.*'
diff --git a/composer.json b/composer.json
@@ -35,15 +35,15 @@
         "phpdocumentor/reflection-docblock": "^5.2",
         "phpdocumentor/type-resolver": "^1.6.1",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.0",
-        "symfony/expression-language": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
+        "symfony/config": "^5.4 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+        "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
+        "symfony/expression-language": "^5.4 || ^6.0 || ^7.0",
+        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
+        "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
+        "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
+        "symfony/property-access": "^5.4 || ^6.0 || ^7.0",
         "webonyx/graphql-php": "^15.4"
     },
     "suggest": {
@@ -55,27 +55,27 @@
     "require-dev": {
         "doctrine/annotations": "^1.13",
         "doctrine/orm": "^2.5",
-        "monolog/monolog": "^2.8.0",
+        "monolog/monolog": "^2.8.0 || ^3.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "1.8.4",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^9.5.10",
         "react/promise": "^2.5",
-        "symfony/asset": "^5.4 || ^6.0",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/css-selector": "^5.4 || ^6.0",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/dom-crawler": "^5.4 || ^6.0",
-        "symfony/finder": "^5.4 || ^6.0",
+        "symfony/asset": "^5.4 || ^6.0 || ^7.0",
+        "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",
+        "symfony/css-selector": "^5.4 || ^6.0 || ^7.0",
+        "symfony/console": "^5.4 || ^6.0 || ^7.0",
+        "symfony/dom-crawler": "^5.4 || ^6.0 || ^7.0",
+        "symfony/finder": "^5.4 || ^6.0 || ^7.0",
         "symfony/monolog-bundle": "^3.7",
         "symfony/phpunit-bridge": "^6.0",
-        "symfony/process": "^5.4 || ^6.0",
-        "symfony/routing": "^5.4 || ^6.0",
-        "symfony/security-bundle": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0",
-        "symfony/var-dumper": "^5.4 || ^6.0",
-        "symfony/yaml": "^5.4 || ^6.0",
+        "symfony/process": "^5.4 || ^6.0 || ^7.0",
+        "symfony/routing": "^5.4 || ^6.0 || ^7.0",
+        "symfony/security-bundle": "^5.4 || ^6.0 || ^7.0",
+        "symfony/validator": "^5.4 || ^6.0 || ^7.0",
+        "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
+        "symfony/yaml": "^5.4 || ^6.0 || ^7.0",
         "twig/twig": "^2.10|^3.0"
     },
     "conflict": {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -441,24 +441,24 @@ parameters:
 			path: tests/Functional/Controller/GraphControllerTest.php
 
 		-
-			message: "#^Method Overblog\\\\GraphQLBundle\\\\Tests\\\\Functional\\\\TestCase\\:\\:createKernel\\(\\) should return Symfony\\\\Component\\\\HttpKernel\\\\KernelInterface but returns object\\.$#"
+			message: "#^Method Overblog\\\\GraphQLBundle\\\\Tests\\\\Functional\\\\BaseTestCase\\:\\:createKernel\\(\\) should return Symfony\\\\Component\\\\HttpKernel\\\\KernelInterface but returns object\\.$#"
 			count: 1
-			path: tests/Functional/TestCase.php
+			path: tests/Functional/BaseTestCase.php
 
 		-
 			message: "#^Missing call to parent\\:\\:tearDown\\(\\) method\\.$#"
 			count: 1
-			path: tests/Functional/TestCase.php
+			path: tests/Functional/BaseTestCase.php
 
 		-
 			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Functional/TestCase.php
+			path: tests/Functional/BaseTestCase.php
 
 		-
 			message: "#^Parameter \\#3 \\$message of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
-			path: tests/Functional/TestCase.php
+			path: tests/Functional/BaseTestCase.php
 
 		-
 			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
diff --git a/src/CacheWarmer/CompileCacheWarmer.php b/src/CacheWarmer/CompileCacheWarmer.php
@@ -27,11 +27,9 @@ public function isOptional(): bool
     }
 
     /**
-     * @param string $cacheDir
-     *
      * @return string[]
      */
-    public function warmUp($cacheDir)
+    public function warmUp(string $cacheDir, string $buildDir = null): array
     {
         if ($this->compiled) {
             // use warm up cache dir if type generator cache dir not already explicitly declared
diff --git a/src/Config/Parser/MetadataParser/MetadataParser.php b/src/Config/Parser/MetadataParser/MetadataParser.php
@@ -134,6 +134,8 @@ private static function processFile(SplFileInfo $file, ContainerBuilder $contain
             }
 
             return $preProcess ? self::$map->toArray() : $gqlTypes;
+        } catch (ReflectionException $e) {
+            return $gqlTypes;
         } catch (\InvalidArgumentException $e) {
             throw new InvalidArgumentException(sprintf('Failed to parse GraphQL metadata from file "%s".', $file), $e->getCode(), $e);
         }
diff --git a/tests/Config/Parser/MetadataParserTest.php b/tests/Config/Parser/MetadataParserTest.php
@@ -615,4 +615,30 @@ public function testInvalidProviderMutationOnQuery(): void
             $this->assertMatchesRegularExpression('/try to add a mutation on type "RootQuery2"/', $e->getPrevious()->getMessage());
         }
     }
+
+    public function testInvalidPhpFiles(): void
+    {
+        $files = [
+            __DIR__.'/fixtures/annotations/Invalid/HasNoClass.php',
+            __DIR__.'/fixtures/annotations/Invalid/EmptyPhpFile.php',
+            __DIR__.'/fixtures/annotations/Invalid/NotAPhpFile',
+            __DIR__.'/fixtures/annotations/Type/RootQuery.php',
+        ];
+        $this->parser('reset', $this->parserConfig);
+
+        foreach ($files as $file) {
+            $this->parser('preParse', new SplFileInfo($file), $this->containerBuilder, $this->parserConfig);
+        }
+
+        $config = [];
+        foreach ($files as $file) {
+            $config += self::cleanConfig($this->parser('parse', new SplFileInfo($file), $this->containerBuilder, $this->parserConfig));
+        }
+
+        $this->assertSame([
+            'RootQuery' => [
+                'type' => 'object',
+            ],
+        ], $config);
+    }
 }
diff --git a/tests/Config/Parser/fixtures/annotations/Invalid/EmptyPhpFile.php b/tests/Config/Parser/fixtures/annotations/Invalid/EmptyPhpFile.php
@@ -0,0 +1,3 @@
+<?php
+
+declare(strict_types=1);
diff --git a/tests/Config/Parser/fixtures/annotations/Invalid/HasNoClass.php b/tests/Config/Parser/fixtures/annotations/Invalid/HasNoClass.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+return function (): void {};
diff --git a/tests/Config/Parser/fixtures/annotations/Invalid/NotAPhpFile b/tests/Config/Parser/fixtures/annotations/Invalid/NotAPhpFile
diff --git a/tests/ExpressionLanguage/TestCase.php b/tests/ExpressionLanguage/TestCase.php
@@ -87,6 +87,7 @@ protected function getSecurityIsGrantedWithExpectation($with, $expects = null, $
             $returnValue = $this->returnValue($return);
         }
 
+        // @phpstan-ignore-next-line
         $methodExpectation = $security
             ->expects($expects)
             ->method('isGranted');
@@ -96,6 +97,7 @@ protected function getSecurityIsGrantedWithExpectation($with, $expects = null, $
         // @phpstan-ignore-next-line
         $methodExpectation->will($returnValue);
 
+        // @phpstan-ignore-next-line
         return new Security($security);
     }
 
diff --git a/tests/Functional/App/Resolver/NodeResolver.php b/tests/Functional/App/Resolver/NodeResolver.php
@@ -5,13 +5,9 @@
 namespace Overblog\GraphQLBundle\Tests\Functional\App\Resolver;
 
 use GraphQL\Type\Definition\ResolveInfo;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-final class NodeResolver implements ContainerAwareInterface
+final class NodeResolver
 {
-    use ContainerAwareTrait;
-
     private array $userData = [
         '1' => [
             'id' => 1,
diff --git a/tests/Functional/App/TestKernel.php b/tests/Functional/App/TestKernel.php
@@ -73,6 +73,16 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
             $loader->load(__DIR__.'/config/config.yml');
         }
 
+        // @phpstan-ignore-next-line
+        if (Kernel::VERSION_ID < 60200) {
+            $loader->load(__DIR__.'/config/config_pre_62.yml');
+        }
+
+        // @phpstan-ignore-next-line
+        if (Kernel::VERSION_ID >= 70000) {
+            $loader->load(__DIR__.'/config/config_post_70.yml');
+        }
+
         $loader->load(function (ContainerBuilder $container): void {
             $container->addCompilerPass($this);
         });
diff --git a/tests/Functional/App/config/config.yml b/tests/Functional/App/config/config.yml
@@ -9,7 +9,6 @@ framework:
     http_method_override: false
 
 security:
-    enable_authenticator_manager: true
     providers:
         in_memory:
             memory:
diff --git a/tests/Functional/App/config/config_post_70.yml b/tests/Functional/App/config/config_post_70.yml
@@ -0,0 +1,2 @@
+framework:
+  handle_all_throwables: false
diff --git a/tests/Functional/App/config/config_pre_62.yml b/tests/Functional/App/config/config_pre_62.yml
@@ -0,0 +1,2 @@
+security:
+  enable_authenticator_manager: true
diff --git a/tests/Functional/App/config/conflictingValidatorNamespaces/config.yml b/tests/Functional/App/config/conflictingValidatorNamespaces/config.yml
@@ -2,10 +2,8 @@ imports:
     - { resource: ../config.yml }
 
 framework:
-    annotations: true
     validation:
         enabled: true
-        enable_annotations: true
 
 overblog_graphql:
     definitions:
diff --git a/tests/Functional/App/config/typeShorthand/config.yml b/tests/Functional/App/config/typeShorthand/config.yml
@@ -1,10 +1,8 @@
 imports:
     - { resource: ../config.yml }
 framework:
-    annotations: true
     validation:
         enabled: true
-        enable_annotations: true
 
 overblog_graphql:
     errors_handler:
@@ -15,6 +13,5 @@ overblog_graphql:
             query: RootQuery
         mappings:
             types:
-                -
-                    type: yaml
-                    dir: "%kernel.project_dir%/config/typeShorthand/mapping"
+                - type: yaml
+                  dir: "%kernel.project_dir%/config/typeShorthand/mapping"
diff --git a/tests/Functional/App/config/validator/config.yml b/tests/Functional/App/config/validator/config.yml
@@ -2,10 +2,8 @@ imports:
     - { resource: ../config.yml }
 
 framework:
-    annotations: true
     validation:
         enabled: true
-        enable_annotations: true
 
 overblog_graphql:
     definitions:
@@ -38,4 +36,3 @@ services:
             - { name: "overblog_graphql.mutation", alias: "mutation_mock", method: "mutationMock" }
             - { name: "overblog_graphql.mutation", alias: "mutation_errors", method: "mutationErrors" }
             - { name: "overblog_graphql.mutation", alias: "no_validation", method: "noValidation" }
-
diff --git a/tests/Functional/BaseTestCase.php b/tests/Functional/BaseTestCase.php
diff --git a/tests/Functional/TestCase.php b/tests/Functional/TestCase.php
diff --git a/tests/Functional/Validator/DummyEntity.php b/tests/Functional/Validator/DummyEntity.php

Original file line number	Diff line number	Diff line change
`@@ -441,24 +441,24 @@ parameters:`
`441`	`441`	`path: tests/Functional/Controller/GraphControllerTest.php`
`442`	`442`
`443`	`443`	`-`
`444`		`- message: "#^Method Overblog\\\\GraphQLBundle\\\\Tests\\\\Functional\\\\TestCase\\:\\:createKernel\\(\\) should return Symfony\\\\Component\\\\HttpKernel\\\\KernelInterface but returns object\\.$#"`
	`444`	`+ message: "#^Method Overblog\\\\GraphQLBundle\\\\Tests\\\\Functional\\\\BaseTestCase\\:\\:createKernel\\(\\) should return Symfony\\\\Component\\\\HttpKernel\\\\KernelInterface but returns object\\.$#"`
`445`	`445`	`count: 1`
`446`		`- path: tests/Functional/TestCase.php`
	`446`	`+ path: tests/Functional/BaseTestCase.php`
`447`	`447`
`448`	`448`	`-`
`449`	`449`	`message: "#^Missing call to parent\\:\\:tearDown\\(\\) method\\.$#"`
`450`	`450`	`count: 1`
`451`		`- path: tests/Functional/TestCase.php`
	`451`	`+ path: tests/Functional/BaseTestCase.php`
`452`	`452`
`453`	`453`	`-`
`454`	`454`	`message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\\|false given\\.$#"`
`455`	`455`	`count: 1`
`456`		`- path: tests/Functional/TestCase.php`
	`456`	`+ path: tests/Functional/BaseTestCase.php`
`457`	`457`
`458`	`458`	`-`
`459`	`459`	`message: "#^Parameter \\#3 \\$message of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) expects string, string\\\|false given\\.$#"`
`460`	`460`	`count: 1`
`461`		`- path: tests/Functional/TestCase.php`
	`461`	`+ path: tests/Functional/BaseTestCase.php`
`462`	`462`
`463`	`463`	`-`
`464`	`464`	`message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\\|false given\\.$#"`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,9 @@ public function isOptional(): bool`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @param string $cacheDir`
`31`		`- *`
`32`	`30`	`* @return string[]`
`33`	`31`	`*/`
`34`		`- public function warmUp($cacheDir)`
	`32`	`+ public function warmUp(string $cacheDir, string $buildDir = null): array`
`35`	`33`	`{`
`36`	`34`	`if ($this->compiled) {`
`37`	`35`	`// use warm up cache dir if type generator cache dir not already explicitly declared`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,8 @@ private static function processFile(SplFileInfo $file, ContainerBuilder $contain`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`return $preProcess ? self::$map->toArray() : $gqlTypes;`
	`137`	`+ } catch (ReflectionException $e) {`
	`138`	`+ return $gqlTypes;`
`137`	`139`	`} catch (\InvalidArgumentException $e) {`
`138`	`140`	`throw new InvalidArgumentException(sprintf('Failed to parse GraphQL metadata from file "%s".', $file), $e->getCode(), $e);`
`139`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+declare(strict_types=1);`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<?php
++
 +declare(strict_types=1);
++
 +return function (): void {};
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ protected function getSecurityIsGrantedWithExpectation($with, $expects = null, $`
`87`	`87`	`$returnValue = $this->returnValue($return);`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ // @phpstan-ignore-next-line`
`90`	`91`	`$methodExpectation = $security`
`91`	`92`	`->expects($expects)`
`92`	`93`	`->method('isGranted');`
`@@ -96,6 +97,7 @@ protected function getSecurityIsGrantedWithExpectation($with, $expects = null, $`
`96`	`97`	`// @phpstan-ignore-next-line`
`97`	`98`	`$methodExpectation->will($returnValue);`
`98`	`99`
	`100`	`+ // @phpstan-ignore-next-line`
`99`	`101`	`return new Security($security);`
`100`	`102`	`}`
`101`	`103`