Allow Symfony 6.0

Author: franmomu

.github/workflows/phpunit.yml

@@ -47,6 +47,12 @@ jobs:
             dependencies: highest
             symfony: '5.4.*'
             stability: 'dev'
+
+          # Test Symfony 6.0 dev version
+          - php: '8.0'
+            dependencies: highest
+            symfony: '6.0.*'
+            stability: 'dev'
     steps:
       - name: Checkout
         uses: actions/checkout@v2

composer.json

@@ -25,12 +25,12 @@
         "php": "^7.4|^8.0",
         "ext-mbstring": "*",
         "imagine/imagine": "^1.2.4",
-        "symfony/filesystem": "^4.4|^5.3",
-        "symfony/finder": "^4.4|^5.3",
-        "symfony/framework-bundle": "^3.4.23|^4.4|^5.3",
-        "symfony/mime": "^4.4|^5.3",
-        "symfony/options-resolver": "^4.4|^5.3",
-        "symfony/process": "^4.4|^5.3",
+        "symfony/filesystem": "^4.4|^5.3|^6.0",
+        "symfony/finder": "^4.4|^5.3|^6.0",
+        "symfony/framework-bundle": "^3.4.23|^4.4|^5.3|^6.0",
+        "symfony/mime": "^4.4|^5.3|^6.0",
+        "symfony/options-resolver": "^4.4|^5.3|^6.0",
+        "symfony/process": "^4.4|^5.3|^6.0",
         "twig/twig": "^1.44|^2.9|^3.0"
     },
     "require-dev": {
@@ -42,16 +42,16 @@
         "phpstan/phpstan": "^0.12.64",
         "psr/cache": "^1.0|^2.0|^3.0",
         "psr/log": "^1.0",
-        "symfony/browser-kit": "^4.4|^5.3",
-        "symfony/cache": "^4.4|^5.3",
-        "symfony/console": "^4.4|^5.3",
-        "symfony/dependency-injection": "^4.4|^5.3",
-        "symfony/form": "^4.4|^5.3",
-        "symfony/messenger": "^4.4|^5.3",
+        "symfony/browser-kit": "^4.4|^5.3|^6.0",
+        "symfony/cache": "^4.4|^5.3|^6.0",
+        "symfony/console": "^4.4|^5.3|^6.0",
+        "symfony/dependency-injection": "^4.4|^5.3|^6.0",
+        "symfony/form": "^4.4|^5.3|^6.0",
+        "symfony/messenger": "^4.4|^5.3|^6.0",
         "symfony/phpunit-bridge": "^5.3",
-        "symfony/templating": "^4.4|^5.3",
-        "symfony/validator": "^4.4|^5.3",
-        "symfony/yaml": "^4.4|^5.3"
+        "symfony/templating": "^4.4|^5.3|^6.0",
+        "symfony/validator": "^4.4|^5.3|^6.0",
+        "symfony/yaml": "^4.4|^5.3|^6.0"
     },
     "suggest": {
         "ext-exif": "required to read EXIF metadata from images",

tests/Functional/AbstractWebTestCase.php

@@ -16,10 +16,7 @@
 
 abstract class AbstractWebTestCase extends WebTestCase
 {
-    /**
-     * @return string
-     */
-    public static function getKernelClass()
+    public static function getKernelClass(): string
     {
         require_once __DIR__.'/app/AppKernel.php';
 

tests/Functional/Controller/ImagineControllerTest.php

@@ -35,7 +35,7 @@ protected function setUp(): void
         // supported by the current PHP build or not. Enabling WebP in configurations will drop all tests if WebP is
         // not supported.
         if ($this->webp_generate) {
-            $filterService = self::getService('liip_imagine.service.filter');
+            $filterService = self::getService('test.liip_imagine.service.filter');
             $webpGenerate = new \ReflectionProperty($filterService, 'webpGenerate');
             $webpGenerate->setAccessible(true);
             $webpGenerate->setValue($filterService, true);

tests/Functional/app/AppKernel.php

@@ -12,6 +12,7 @@
 namespace Liip\ImagineBundle\Tests\Functional\app;
 
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
@@ -48,11 +49,21 @@ public function getProjectDir(): string
      */
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
-        if (version_compare(self::VERSION, '5.3', '>=')) {
-            $loader->load(__DIR__.'/config/symfony_5-3.yaml');
-        } else {
-            $loader->load(__DIR__.'/config/symfony_legacy.yaml');
-        }
-        $loader->load(__DIR__.'/config/config.yml');
+        $loader->load(function (ContainerBuilder $container) use ($loader) {
+            if (version_compare(self::VERSION, '5.3', '>=')) {
+                $loader->load($this->getProjectDir().'/config/symfony_5-3.yaml');
+            } else {
+                $loader->load($this->getProjectDir().'/config/symfony_legacy.yaml');
+            }
+
+            $loader->load($this->getProjectDir().'/config/config.yml');
+
+            $container
+                ->setAlias('test.liip_imagine.service.filter', 'liip_imagine.service.filter')
+                ->setPublic(true);
+            $container
+                ->setAlias('test.liip_imagine.filter.manager', 'liip_imagine.filter.manager')
+                ->setPublic(true);
+        });
     }
 }

tests/Message/Handler/WarmupCacheHandlerTest.php

@@ -74,14 +74,14 @@ public function testThrowIfMessageMissingPath(): void
      */
     private function createFilterManagerMock()
     {
-        return $this->getService('liip_imagine.filter.manager');
+        return $this->getService('test.liip_imagine.filter.manager');
     }
 
     /**
      * @return object|FilterService
      */
     private function createFilterServiceMock()
     {
-        return $this->getService('liip_imagine.service.filter');
+        return $this->getService('test.liip_imagine.service.filter');
     }
 }