Merge pull request #1144 from sparklink-pro/master

Symfony 7 / PHP 8.3 compatibility
overblog · Dec 11, 2023 · a223567 · a223567
2 parents 6f87cf0 + 4413d43
commit a223567
Show file tree

Hide file tree

Showing 16 changed files with 249 additions and 230 deletions.
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/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" }
-