Fixing routing config in tests

Author: weaverryan

.github/workflows/ci.yml

@@ -8,26 +8,23 @@ on:
 
 jobs:
   tests:
-    name: "Tests ${{ matrix.php-version }} ${{ matrix.dependency-versions }} deps ${{ matrix.dependency-versions }}"
+    name: "Tests ${{ matrix.php-version }} deps ${{ matrix.dependency-versions }}"
     runs-on: ubuntu-18.04
 
     strategy:
       fail-fast: false
       matrix:
         # normal, highest, non-dev installs
         php-version: ['7.2', '7.3', '7.4', '8.0', '8.1']
-        composer-options: ['--prefer-stable']
         dependency-versions: ['highest']
         include:
           # testing lowest PHP version with lowest dependencies
           - php-version: '7.2.5'
             dependency-versions: 'lowest'
-            composer-options: '--prefer-lowest'
 
           # testing dev versions with highest PHP
           - php-version: '8.0'
             dependency-versions: 'highest'
-            composer-options: '' # allow dev deps
 
     steps:
       - name: "Checkout code"
@@ -44,7 +41,7 @@ jobs:
           composer global require --no-progress --no-scripts --no-plugins symfony/flex @dev
 
       - name: "Composer install"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
         with:
             dependency-versions: "${{ matrix.dependency-versions }}"
             composer-options: "--prefer-dist --no-progress"

composer.json

@@ -1,8 +1,8 @@
 {
     "name": "symfony/webpack-encore-bundle",
-    "type": "symfony-bundle",
     "description": "Integration with your Symfony app & Webpack Encore!",
     "license": "MIT",
+    "type": "symfony-bundle",
     "authors": [
         {
             "name": "Symfony Community",
@@ -23,12 +23,7 @@
         "symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0",
         "symfony/web-link": "^4.4 || ^5.0 || ^6.0"
     },
-    "extra": {
-        "thanks": {
-            "name": "symfony/webpack-encore",
-            "url": "https://github.com/symfony/webpack-encore"
-        }
-    },
+    "minimum-stability": "dev",
     "autoload": {
         "psr-4": {
             "Symfony\\WebpackEncoreBundle\\": "src"
@@ -39,5 +34,10 @@
             "Symfony\\WebpackEncoreBundle\\Tests\\": "tests/"
         }
     },
-    "minimum-stability": "dev"
+    "extra": {
+        "thanks": {
+            "name": "symfony/webpack-encore",
+            "url": "https://github.com/symfony/webpack-encore"
+        }
+    }
 }

src/EventListener/ResetAssetsEventListener.php

@@ -2,6 +2,13 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of the Symfony WebpackEncoreBundle package.
+ * (c) Fabien Potencier <[email protected]>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\WebpackEncoreBundle\EventListener;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

tests/IntegrationTest.php

@@ -531,6 +531,10 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         // avoid logging request logs
         $container->register('logger', Logger::class)
             ->setArgument(0, LogLevel::EMERGENCY);
+
+        // @legacy for 5.0 and earlier: did not have controller.service_arguments tag
+        $container->getDefinition('kernel')
+            ->addTag('controller.service_arguments');
     }
 
     public function getCacheDir(): string
@@ -556,7 +560,7 @@ public function renderSubRequests(Request $request, HttpKernelInterface $httpKer
         $response0 = $httpKernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
         $response1 = $httpKernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
 
-        return new Response($response0->getContent() . $response1->getContent());
+        return new Response($response0->getContent().$response1->getContent());
     }
 
     public function renderTwig(Environment $twig, Request $request)
@@ -568,26 +572,25 @@ public function renderTwig(Environment $twig, Request $request)
 if (AbstractWebpackEncoreIntegrationTestKernel::VERSION_ID >= 50100) {
     class WebpackEncoreIntegrationTestKernel extends AbstractWebpackEncoreIntegrationTestKernel
     {
-        protected function configureRouting(RoutingConfigurator $routes): void
+        protected function configureRoutes(RoutingConfigurator $routes): void
         {
-            $routes->add('/foo', 'kernel::renderFoo');
-            $routes->add('/render', 'kernel::renderTwig');
-            $routes->add('/render-sub-requests', 'kernel::renderSubRequests');
+            $routes->add('foo', '/foo')->controller('kernel::renderFoo');
+            $routes->add('render', '/render')->controller('kernel::renderTwig');
+            $routes->add('render_sub_requests', '/render-sub-requests')->controller('kernel::renderSubRequests');
         }
     }
 } else {
     class WebpackEncoreIntegrationTestKernel extends AbstractWebpackEncoreIntegrationTestKernel
     {
         protected function configureRoutes(RouteCollectionBuilder $routes)
         {
-            $routes->add('/foo', 'kernel:::renderFoo');
+            $routes->add('/foo', 'kernel::renderFoo');
             $routes->add('/render', 'kernel::renderTwig');
             $routes->add('/render-sub-requests', 'kernel::renderSubRequests');
         }
     }
 }
 
-
 class WebpackEncoreCacheWarmerTester
 {
     private $entrypointCacheWarmer;