Add support for Symfony 7 (#12)

Sylius · Jun 21, 2024 · 3c7ec7a · 3c7ec7a
2 parents c955e5c + 3756bfa
commit 3c7ec7a
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 38 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,7 +14,10 @@ jobs:
             fail-fast: false
             matrix:
                 php: [ "8.1", "8.2", "8.3" ]
-                symfony: [ "^6.4" ]
+                symfony: [ "^6.4", "^7.0" ]
+                exclude:
+                    - php: "8.1"
+                      symfony: "^7.0"
         name: "PHP ${{ matrix.php }} / Symfony ${{ matrix.symfony }}"
         env:
             APP_ENV: test

diff --git a/composer.json b/composer.json
@@ -16,32 +16,32 @@
     "require": {
         "php": "^8.1",
         "laminas/laminas-stdlib": "^3.18",
-        "symfony/config": "^6.4",
-        "symfony/dependency-injection": "^6.4",
-        "symfony/expression-language": "^6.4",
-        "symfony/http-kernel": "^6.4",
-        "symfony/stopwatch": "^6.4",
-        "symfony/twig-bundle": "^6.4",
+        "symfony/config": "^6.4 || ^7.0",
+        "symfony/dependency-injection": "^6.4 || ^7.0",
+        "symfony/expression-language": "^6.4 || ^7.0",
+        "symfony/http-kernel": "^6.4 || ^7.0",
+        "symfony/stopwatch": "^6.4 || ^7.0",
+        "symfony/twig-bundle": "^6.4 || ^7.0",
         "symfony/ux-live-component": "^2.17",
         "symfony/ux-twig-component": "^2.17",
         "twig/twig": "^2.15 || ^3.0"
     },
     "require-dev": {
-        "matthiasnoback/symfony-config-test": "^4.3",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3.1",
+        "matthiasnoback/symfony-config-test": "^5.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.1",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-symfony": "^1.3",
         "phpunit/phpunit": "^9.6",
-        "symfony/console": "^6.4",
-        "symfony/debug-bundle": "^6.4",
-        "symfony/dom-crawler": "^6.4",
-        "symfony/dotenv": "^6.4",
+        "symfony/console": "^6.4 || ^7.0",
+        "symfony/debug-bundle": "^6.4 || ^7.0",
+        "symfony/dom-crawler": "^6.4 || ^7.0",
+        "symfony/dotenv": "^6.4 || ^7.0",
         "symfony/flex": "^2.4",
-        "symfony/framework-bundle": "^6.4",
-        "symfony/runtime": "^6.4",
-        "symfony/translation": "^6.4",
-        "symfony/web-profiler-bundle": "^6.4",
-        "symfony/yaml": "^6.4 ",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/runtime": "^6.4 || ^7.0",
+        "symfony/translation": "^6.4 || ^7.0",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.0",
+        "symfony/yaml": "^6.4 || ^7.0",
         "symplify/monorepo-builder": "11.2.*"
     },
     "autoload": {
@@ -69,7 +69,7 @@
     },
     "extra": {
         "symfony": {
-            "require": "6.4.*"
+            "require": "7.0.*"
         }
     }
 }
diff --git a/monorepo-builder.php b/monorepo-builder.php
@@ -13,7 +13,7 @@
         ],
         ComposerJsonSection::REQUIRE_DEV => [
             'phpstan/phpstan' => '^1.10',
-            'symfony/debug-bundle' => '^6.4',
+            'symfony/debug-bundle' => '^6.4 || ^7.0',
             'symfony/flex' => '^2.4',
             'symplify/monorepo-builder' => '11.2.*',
             'phpstan/phpstan-symfony' => '^1.3'

diff --git a/src/TwigHooks/composer.json b/src/TwigHooks/composer.json
@@ -16,28 +16,28 @@
     "require": {
         "php": "^8.1",
         "laminas/laminas-stdlib": "^3.18",
-        "symfony/config": "^6.4",
-        "symfony/dependency-injection": "^6.4",
-        "symfony/expression-language": "^6.4",
-        "symfony/http-kernel": "^6.4",
-        "symfony/stopwatch": "^6.4",
+        "symfony/config": "^6.4 || ^7.0",
+        "symfony/dependency-injection": "^6.4 || ^7.0",
+        "symfony/expression-language": "^6.4 || ^7.0",
+        "symfony/http-kernel": "^6.4 || ^7.0",
+        "symfony/stopwatch": "^6.4 || ^7.0",
         "symfony/ux-live-component": "^2.17",
         "symfony/ux-twig-component": "^2.17",
-        "symfony/twig-bundle": "^6.4",
+        "symfony/twig-bundle": "^6.4 || ^7.0",
         "twig/twig": "^2.15 || ^3.0"
     },
     "require-dev": {
-        "symfony/console": "^6.4",
-        "symfony/dom-crawler": "^6.4",
-        "symfony/dotenv": "^6.4",
-        "symfony/framework-bundle": "^6.4",
-        "symfony/runtime": "^6.4",
-        "symfony/translation": "^6.4",
-        "symfony/twig-bundle": "^6.4",
-        "symfony/web-profiler-bundle": "^6.4",
-        "symfony/yaml": "^6.4 ",
-        "matthiasnoback/symfony-config-test": "^4.3",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3.1",
+        "symfony/console": "^6.4 || ^7.0",
+        "symfony/dom-crawler": "^6.4 || ^7.0",
+        "symfony/dotenv": "^6.4 || ^7.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/runtime": "^6.4 || ^7.0",
+        "symfony/translation": "^6.4 || ^7.0",
+        "symfony/twig-bundle": "^6.4 || ^7.0",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.0",
+        "symfony/yaml": "^6.4 || ^7.0",
+        "matthiasnoback/symfony-config-test": "^5.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.1",
         "phpunit/phpunit": "^9.6"
     },
     "suggest": {

diff --git a/src/TwigHooks/config/services/hookable_merger.php b/src/TwigHooks/config/services/hookable_merger.php
@@ -9,6 +9,6 @@
     $services = $configurator->services();
 
     $services->set('twig_hooks.merger.hookable', HookableMerger::class)
-        ->alias(HookableMergerInterface::class, 'twig_hooks.renderer.hookable')
+        ->alias(HookableMergerInterface::class, 'twig_hooks.merger.hookable')
     ;
 };