Add support for Symfony 6

Author: andrewmy

Tests/Functional/WebTestCase.php

@@ -40,10 +40,7 @@ protected function tearDown(): void
         static::ensureKernelShutdown();
     }
 
-    /**
-     * @return string
-     */
-    public static function getKernelClass()
+    public static function getKernelClass(): string
     {
         require_once __DIR__.'/app/AppKernel.php';
 

Tests/Functional/app/AppKernel.php

@@ -7,10 +7,7 @@
 
 class AppKernel extends Kernel
 {
-    /**
-     * @return array
-     */
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         $bundles = [
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
@@ -20,28 +17,28 @@ public function registerBundles()
         return $bundles;
     }
 
-    /**
-     * @return string
-     */
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return sys_get_temp_dir().'/EnqueueJobQueue/cache';
     }
 
-    /**
-     * @return string
-     */
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return sys_get_temp_dir().'/EnqueueJobQueue/cache/logs';
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
+        if (self::VERSION_ID < 60000) {
+            $loader->load(__DIR__.'/config/config-sf5.yml');
+
+            return;
+        }
+
         $loader->load(__DIR__.'/config/config.yml');
     }
 
-    protected function getContainerClass()
+    protected function getContainerClass(): string
     {
         return parent::getContainerClass().'JobQueue';
     }

Tests/Functional/app/config/config-sf5.yml

@@ -0,0 +1,33 @@
+parameters:
+    locale: 'en'
+    secret: 'ThisTokenIsNotSoSecretChangeIt'
+
+framework:
+    #esi:             ~
+    #translator:      { fallback: "%locale%" }
+    test: ~
+    assets: false
+    session:
+        # the only option incompatible with Symfony 6
+        storage_id: session.storage.mock_file
+    secret:          "%secret%"
+    router:          { resource: "%kernel.project_dir%/config/routing.yml" }
+    default_locale:  "%locale%"
+
+doctrine:
+    dbal:
+        url:   "%env(DOCTRINE_DSN)%"
+        driver: pdo_mysql
+        charset:  UTF8
+        wrapper_class: "Enqueue\\JobQueue\\Test\\DbalPersistedConnection"
+    orm:
+        auto_generate_proxy_classes: true
+        auto_mapping: true
+        mappings:
+            TestEntity:
+                mapping: true
+                type: annotation
+                dir: '%kernel.project_dir%/Tests/Functional/Entity'
+                alias: 'EnqueueJobQueue'
+                prefix: 'Enqueue\JobQueue\Tests\Functional\Entity'
+                is_bundle: false

Tests/Functional/app/config/config.yml

@@ -8,7 +8,7 @@ framework:
     test: ~
     assets: false
     session:
-        storage_id: session.storage.mock_file
+        storage_factory_id: session.storage.factory.mock_file
     secret:          "%secret%"
     router:          { resource: "%kernel.project_dir%/config/routing.yml" }
     default_locale:  "%locale%"

composer.json

@@ -17,10 +17,10 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "doctrine/doctrine-bundle": "^2.0",
-        "symfony/browser-kit": "^4.3|^5",
-        "symfony/expression-language": "^4.3|^5",
-        "symfony/framework-bundle": "^4.3|^5",
-        "symfony/yaml": "^4.3|^5"
+        "symfony/browser-kit": "^4.3|^5|^6.0",
+        "symfony/expression-language": "^4.3|^5|^6.0",
+        "symfony/framework-bundle": "^4.3|^5|^6.0",
+        "symfony/yaml": "^4.3|^5|^6.0"
     },
     "support": {
         "email": "[email protected]",