Test 8.2 and 8.3 PHP against Symfony 7 rest against stable branches

sulu · Jun 10, 2024 · b3989ef · b3989ef
1 parent 059da68
commit b3989ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -88,6 +88,10 @@ jobs:
             - name: Remove not required test tooling
               run: composer remove "*php-cs-fixer*" "*phpstan*" --no-update --dev
 
+            - name: Install Symfony 7 dev branch # TODO remove
+              if: ${{ matrix.php-version == '8.2' || matrix.php-version == '8.3' }}
+              run: composer require sulu/sulu:"dev-feature/symfony-7-support as 2.6.3" --no-update
+
             - name: Install composer dependencies
               uses: ramsey/composer-install@v3
               with:

diff --git a/Tests/Functional/Controller/NavigationControllerTest.php b/Tests/Functional/Controller/NavigationControllerTest.php
@@ -117,7 +117,8 @@ public function provideAttributes(): \Generator
         $suluSuluVersion = \Composer\InstalledVersions::getVersion('sulu/sulu');
 
         /* Todo Can be removed after ending support of sulu 2.5 */
-        if (\version_compare($suluSuluVersion ?? '999.999.999', '2.6.0', '<')
+        if ($suluSuluVersion
+            && \version_compare($suluSuluVersion ?? '999.999.999', '2.6.0', '<')
             && 0 !== \strpos($suluSuluVersion, 'dev-')
         ) {
             $path = '/legacy/';

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "sulu/sulu": "dev-feature/symfony-7-support as 2.6.3",
+        "sulu/sulu": "^2.4 || ^2.5@dev",
         "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",