Fix tests

Author: franmomu

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

@@ -11,11 +11,18 @@
 
 namespace Liip\ImagineBundle\Tests\Functional\app;
 
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Routing\Loader\Configurator\RouteConfigurator;
+use Symfony\Component\Routing\RouteCollectionBuilder;
 
 class AppKernel extends Kernel
 {
+    use MicroKernelTrait;
+
     public function registerBundles(): iterable
     {
         $bundles = [
@@ -44,15 +51,37 @@ public function getProjectDir(): string
     }
 
     /**
-     * @throws \Exception
+     * @param RouteCollectionBuilder|RouteConfigurator $routes
+     */
+    protected function configureRoutes($routes): void
+    {
+        $routes->import($this->getProjectDir().'/config/routing.yml');
+    }
+
+    /**
+     * @param ContainerBuilder|ContainerConfigurator $containerBuilder
      */
-    public function registerContainerConfiguration(LoaderInterface $loader): void
+    protected function configureContainer($containerBuilder, LoaderInterface $loader): void
     {
         if (version_compare(self::VERSION, '5.3', '>=')) {
-            $loader->load(__DIR__.'/config/symfony_5-3.yaml');
+            $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');
+
+        if ($containerBuilder instanceof ContainerBuilder) {
+            $containerBuilder
+                ->setAlias('test.liip_imagine.service.filter', 'liip_imagine.service.filter')
+                ->setPublic(true);
+            $containerBuilder
+                ->setAlias('test.liip_imagine.filter.manager', 'liip_imagine.filter.manager')
+                ->setPublic(true);
         } else {
-            $loader->load(__DIR__.'/config/symfony_legacy.yaml');
+            $containerBuilder->services()
+                ->alias('test.liip_imagine.service.filter', 'liip_imagine.service.filter')->public()
+                ->alias('test.liip_imagine.filter.manager', 'liip_imagine.filter.manager')->public();
         }
-        $loader->load(__DIR__.'/config/config.yml');
     }
 }

tests/Functional/app/config/config.yml

@@ -13,9 +13,6 @@ framework:
     default_locale: "%locale%"
     test:           ~
 
-    router:
-        resource: "%kernel.project_dir%/config/routing.yml"
-
 liip_imagine:
 
     controller:

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');
     }
 }