Add Symfony 7 support & Update PHP-CS-Fixer (#133)

sulu · Jul 25, 2024 · ca49c52 · ca49c52
1 parent 1875720
commit ca49c52
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -34,6 +34,27 @@ jobs:
                       lint: true
                       env:
                         SYMFONY_DEPRECATIONS_HELPER: weak
+                    - php-version: '8.1'
+                      dependency-versions: 'highest'
+                      php-extensions: 'ctype, iconv, mysql, imagick'
+                      tools: 'composer:v2'
+                      lint: true
+                      env:
+                        SYMFONY_DEPRECATIONS_HELPER: weak
+                    - php-version: '8.2'
+                      dependency-versions: 'highest'
+                      php-extensions: 'ctype, iconv, mysql, imagick'
+                      tools: 'composer:v2'
+                      lint: true
+                      env:
+                        SYMFONY_DEPRECATIONS_HELPER: weak
+                    - php-version: '8.3'
+                      dependency-versions: 'highest'
+                      php-extensions: 'ctype, iconv, mysql, imagick'
+                      tools: 'composer:v2'
+                      lint: true
+                      env:
+                        SYMFONY_DEPRECATIONS_HELPER: weak
 
         services:
             mysql:

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -22,7 +22,7 @@
 
 class Configuration implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('sulu_sylius_consumer');
         $treeBuilder->getRootNode()

diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -22,7 +22,7 @@
 
 if (\file_exists(__DIR__ . '/../.env')) {
     if (!\class_exists(Dotenv::class)) {
-        throw new \RuntimeException('Add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
+        throw new RuntimeException('Add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
     }
 
     (new Dotenv())->load(__DIR__ . '/../.env');

diff --git a/composer.json b/composer.json
@@ -13,27 +13,27 @@
     "require": {
         "php": "^7.2|^8.0",
         "sulu/sulu": "^2.1 || 2.x-dev",
-        "symfony/config": "^4.4 || ^5.0 || ^6.0",
-        "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
-        "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
-        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
-        "symfony/messenger": "^4.4 || ^5.0 || ^6.0",
+        "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/messenger": "^4.4 || ^5.0 || ^6.0 || ^7.0",
         "webmozart/assert": "^1.9"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.15 || ^3.0",
+        "php-cs-fixer/shim": "^3.9",
         "handcraftedinthealps/zendsearch": "^2.0",
-        "jackalope/jackalope-doctrine-dbal": "^1.3.4",
+        "jackalope/jackalope-doctrine-dbal": "^1.3.4|| ^2.0",
         "jangregor/phpstan-prophecy": "^1.0",
         "phpspec/prophecy": "^1.15",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-doctrine": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^8.2",
-        "symfony/browser-kit": "^4.4 || ^5.0 | ^6.0",
-        "symfony/dotenv": "^4.4 || ^5.0 || ^6.0",
-        "symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
+        "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/dotenv": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0",
         "symfony/monolog-bundle": "^3.3"
     },
     "conflict": {