Add Symfony 8 support (#391)

Author: smnandre

.github/workflows/test.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
     test:
-        name: PHP ${{ matrix.php-version }} + ${{ matrix.dependencies }}
+        name: ${{ matrix.name || format('PHP {0} - {1}', matrix.php-version, matrix.dependencies) }}
         runs-on: ubuntu-latest
 
         env:
@@ -28,9 +28,15 @@ jobs:
                 include:
                     - php-version: 8.0
                       dependencies: lowest
+                      name: PHP 8.0 - lowest
                     - php-version: 8.4
                       dependencies: highest
-                      symfony-require: 7.2.*
+                      symfony-require: 7.3.*
+                      name: PHP 8.4 - highest - Symfony 7.3
+                    - php-version: 8.4
+                      dependencies: highest
+                      symfony-require: 8.0.*@dev
+                      name: PHP 8.4 - highest - Symfony 8.0@dev
 
         steps:
             - name: Checkout
@@ -51,6 +57,14 @@ jobs:
                   composer global config --no-plugins allow-plugins.symfony/flex true
                   composer global require --no-progress --no-scripts --no-plugins symfony/flex
 
+            - name: Add matrix to composer.json for cache key
+              if: matrix.symfony-require != ''
+              run: composer config extra.symfony-require-for-cache "${{ matrix.symfony-require }}"
+
+            - name: Remove conflicting dependencies for Symfony 8 dev
+              if: matrix.symfony-require == '8.0.*@dev'
+              run: composer remove --dev friendsofphp/php-cs-fixer infection/infection twig/cache-extra --no-update
+
             - name: Install Composer dependencies ${{ matrix.dependencies }}
               uses: ramsey/composer-install@v3
               with:

bin/twig-cs-fixer

@@ -20,6 +20,11 @@ use TwigCsFixer\Console\Command\TwigCsFixerCommand;
 $command = new TwigCsFixerCommand();
 
 $application = new Application();
-$application->add($command);
+// Compatibility layer for symfony/console <7.4
+if (method_exists($application, 'addCommand')) {
+    $application->addCommand($command);
+} else {
+    $application->add($command);
+}
 $application->setDefaultCommand($command->getName());
 $application->run();

composer.json

@@ -14,10 +14,10 @@
         "ext-ctype": "*",
         "ext-json": "*",
         "composer-runtime-api": "^2.0.0",
-        "symfony/console": "^5.4.9 || ^6.4 || ^7.0",
-        "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
-        "symfony/finder": "^5.4 || ^6.4 || ^7.0",
-        "symfony/string": "^5.4.42 || ^6.4.10 || ~7.0.10 || ^7.1.3",
+        "symfony/console": "^5.4.9 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/filesystem": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/finder": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/string": "^5.4.42 || ^6.4.10 || ~7.0.10 || ^7.1.3 || ^8.0",
         "twig/twig": "^3.4",
         "webmozart/assert": "^1.10"
     },
@@ -35,8 +35,8 @@
         "phpunit/phpunit": "^9.5.26 || ^11.5.18 || ^12.1.3",
         "rector/rector": "^2.0.0",
         "shipmonk/composer-dependency-analyser": "^1.6",
-        "symfony/process": "^5.4 || ^6.4 || ^7.0",
-        "symfony/twig-bridge": "^5.4 || ^6.4 || ^7.0",
+        "symfony/process": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/twig-bridge": "^5.4 || ^6.4 || ^7.0 || ^8.0",
         "symfony/ux-twig-component": "^2.2.0",
         "twig/cache-extra": "^3.2"
     },

tests/Environment/StubbedEnvironmentTest.php

@@ -148,6 +148,10 @@ public function testParse(): void
 
     public function testParseCacheTag(): void
     {
+        if (!InstalledVersions::isInstalled('twig/cache-extra')) {
+            static::markTestSkipped('twig/cache-extra is required.');
+        }
+
         $content = file_get_contents(__DIR__.'/Fixtures/cache_tag.html.twig');
         static::assertNotFalse($content);