Fix deprecated and modulate TestCase

Author: Vincz

src/CacheWarmer/CompileCacheWarmer.php

@@ -31,7 +31,7 @@ public function isOptional(): bool
      *
      * @return string[]
      */
-    public function warmUp($cacheDir, string $buildDir = null)
+    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

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,

tests/Functional/App/config/config.yml

@@ -9,7 +9,7 @@ framework:
     http_method_override: false
 
 security:
-    enable_authenticator_manager: true
+    #enable_authenticator_manager: true
     providers:
         in_memory:
             memory:

tests/Functional/App/config/conflictingValidatorNamespaces/config.yml

@@ -2,10 +2,10 @@ imports:
     - { resource: ../config.yml }
 
 framework:
-    annotations: true
+    # annotations: true
     validation:
         enabled: true
-        enable_annotations: true
+        # enable_annotations: true
 
 overblog_graphql:
     definitions:

tests/Functional/App/config/typeShorthand/config.yml

@@ -1,10 +1,10 @@
 imports:
     - { resource: ../config.yml }
 framework:
-    annotations: true
+    # annotations: true
     validation:
         enabled: true
-        enable_annotations: true
+        # enable_annotations: true
 
 overblog_graphql:
     errors_handler:
@@ -15,6 +15,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"

tests/Functional/TestCase.php

@@ -8,9 +8,11 @@
 use Overblog\GraphQLBundle\Tests\Functional\App\TestKernel;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 use function call_user_func;
@@ -23,10 +25,31 @@
 use function strtolower;
 use function sys_get_temp_dir;
 
+if (Kernel::VERSION_ID < 70000) {
+    abstract class TestCase extends BaseTestCase
+    {
+        protected static function getContainer(): ContainerInterface
+        {
+            /** @phpstan-ignore-next-line */
+            return static::$kernel->getContainer();
+        }
+    }
+} else {
+    abstract class TestCase extends BaseTestCase
+    {
+        protected static function getContainer(): Container
+        {
+            /** @phpstan-ignore-next-line */
+            return static::$kernel->getContainer();
+        }
+    }
+}
+
+
 /**
  * TestCase.
  */
-abstract class TestCase extends WebTestCase
+abstract class BaseTestCase extends WebTestCase
 {
     public const USER_RYAN = 'ryan';
     public const USER_ADMIN = 'admin';
@@ -52,7 +75,7 @@ protected static function createKernel(array $options = []): KernelInterface
 
         $options['test_case'] ??= '';
 
-        $env = $options['environment'] ?? 'test'.strtolower($options['test_case']);
+        $env = $options['environment'] ?? 'test' . strtolower($options['test_case']);
         $debug = $options['debug'] ?? true;
 
         return new static::$class($env, $debug, $options['test_case']);
@@ -64,7 +87,7 @@ protected static function createKernel(array $options = []): KernelInterface
     public static function setUpBeforeClass(): void
     {
         $fs = new Filesystem();
-        $fs->remove(sys_get_temp_dir().'/OverblogGraphQLBundle/');
+        $fs->remove(sys_get_temp_dir() . '/OverblogGraphQLBundle/');
     }
 
     protected function tearDown(): void
@@ -105,12 +128,6 @@ protected static function assertGraphQL(string $query, array $expectedData = nul
         static::assertSame($expected, $result, json_encode($result));
     }
 
-    protected static function getContainer(): ContainerInterface
-    {
-        /** @phpstan-ignore-next-line */
-        return static::$kernel->getContainer();
-    }
-
     protected static function query(string $query, string $username, string $testCase, string $password = self::DEFAULT_PASSWORD): KernelBrowser
     {
         $client = static::createClientAuthenticated($username, $testCase, $password);
@@ -164,7 +181,7 @@ public static function expressionFunctionFromPhp(string $phpFunctionName)
             return call_user_func([ExpressionFunction::class, 'fromPhp'], $phpFunctionName);
         }
 
-        return new ExpressionFunction($phpFunctionName, fn () => sprintf('\%s(%s)', $phpFunctionName, implode(', ', func_get_args())), function (): void {});
+        return new ExpressionFunction($phpFunctionName, fn() => sprintf('\%s(%s)', $phpFunctionName, implode(', ', func_get_args())), function (): void {});
     }
 
     /**

tests/Functional/Validator/DummyEntity.php

@@ -8,7 +8,6 @@
 
 /**
  * Class DummyEntity.
- *
  */
 #[Assert\Callback([StaticValidator::class, 'validateClass'])]
 final class DummyEntity