Add Support for Symfony 7

sulu · Jul 16, 2024 · 25726b1 · 25726b1
1 parent 66027c7
commit 25726b1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 33 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -21,39 +21,25 @@ jobs:
                 include:
                     - php-version: '7.2'
                       dependency-versions: 'lowest'
-                      tools: 'composer:v2'
-                      env:
-                          SYMFONY_DEPRECATIONS_HELPER: disabled
 
                     - php-version: '7.4'
                       dependency-versions: 'highest'
-                      tools: 'composer:v2'
-                      env:
-                          SYMFONY_DEPRECATIONS_HELPER: weak
 
                     - php-version: '8.0'
                       dependency-versions: 'highest'
-                      tools: 'composer:v2'
-                      env:
-                          SYMFONY_DEPRECATIONS_HELPER: weak
 
                     - php-version: '8.1'
                       dependency-versions: 'highest'
-                      tools: 'composer:v2'
-                      env:
-                          SYMFONY_DEPRECATIONS_HELPER: weak
 
                     - php-version: '8.2'
                       dependency-versions: 'highest'
-                      tools: 'composer:v2'
-                      env:
-                          SYMFONY_DEPRECATIONS_HELPER: weak
 
                     - php-version: '8.3'
                       dependency-versions: 'highest'
-                      tools: 'composer:v2'
-                      env:
-                          SYMFONY_DEPRECATIONS_HELPER: weak
+
+                    - php-version: '8.4'
+                      dependency-versions: 'highest'
+                      composer-options: '--ignore-platform-reqs'
 
         services:
             mysql:
@@ -73,10 +59,10 @@ jobs:
               with:
                   php-version: ${{ matrix.php-version }}
                   extensions: 'mysql, gd'
-                  tools: ${{ matrix.tools }}
+                  tools: 'composer:v2'
 
             - name: Remove not required tooling
-              run: composer remove php-cs-fixer/shim "*phpstan*" --dev --no-interaction --no-update
+              run: composer remove "*php-cs-fixer*" "*phpstan*" "*rector*" --dev --no-interaction --no-update
 
             - name: Install composer dependencies
               uses: ramsey/composer-install@v1
@@ -89,7 +75,6 @@ jobs:
 
             - name: Execute test cases
               run: composer test
-              env: ${{ matrix.env }}
 
     lint:
         name: 'PHP Lint'

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

diff --git a/composer.json b/composer.json
@@ -18,29 +18,29 @@
         "php-task/php-task": "^1.3.3 || ^2.0",
         "php-task/task-bundle": "^2.0 || ^3.0",
         "sulu/sulu": "^2.2.0 || ^2.5.0@dev",
-        "symfony/config": "^4.3 || ^5.4 || ^6.3",
-        "symfony/dependency-injection": "^4.3 || ^5.4 || ^6.3",
+        "symfony/config": "^4.3 || ^5.4 || ^6.3 || ^7.0",
+        "symfony/dependency-injection": "^4.3 || ^5.4 || ^6.3 || ^7.0",
         "symfony/deprecation-contracts": "^1.0 || ^2.0 || ^3.0",
-        "symfony/http-foundation": "^4.3 || ^5.4 || ^6.3",
-        "symfony/http-kernel": "^4.3 || ^5.4 || ^6.3"
+        "symfony/http-foundation": "^4.3 || ^5.4 || ^6.3 || ^7.0",
+        "symfony/http-kernel": "^4.3 || ^5.4 || ^6.3 || ^7.0"
     },
     "require-dev": {
         "handcraftedinthealps/zendsearch": "^2.0",
-        "jackalope/jackalope-doctrine-dbal": "^1.3.0",
+        "jackalope/jackalope-doctrine-dbal": "^1.3.0 || ^2.0",
         "jangregor/phpstan-prophecy": "^1.0",
         "php-cs-fixer/shim": "^3.0",
         "phpspec/prophecy": "^1.8",
+        "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-doctrine": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
-        "phpunit/phpunit": "^8.4",
-        "symfony/browser-kit": "^4.3 || ^5.4 || ^6.3",
-        "symfony/dotenv": "^4.3 || ^5.4 || ^6.3",
+        "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.0",
+        "symfony/browser-kit": "^4.3 || ^5.4 || ^6.3 || ^7.0",
+        "symfony/dotenv": "^4.3 || ^5.4 || ^6.3 || ^7.0",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/security-bundle": "^4.3 || ^5.4 || ^6.3",
-        "symfony/stopwatch": "^4.3 || ^5.4 || ^6.3",
-        "symfony/templating": "^4.3 || ^5.4 || ^6.3",
+        "symfony/security-bundle": "^4.3 || ^5.4 || ^6.3 || ^7.0",
+        "symfony/stopwatch": "^4.3 || ^5.4 || ^6.3 || ^7.0",
         "thecodingmachine/phpstan-strict-rules": "^1.0"
     },
     "autoload": {