Merge branch '2.5' of github.com:sulu/skeleton into 2.6

Conflicts: .github/workflows/test-application.yaml composer.json
sulu · Nov 27, 2024 · 70761c8 · 70761c8
2 parents 835ccad + e7afcd5
commit 70761c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -97,10 +97,11 @@ jobs:
 
             - name: Install composer dependencies
               if: ${{ !matrix.create-project }}
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v3
               with:
-                  composer-options: '--no-cache --working-dir=${{ matrix.working-directory }}'
+                  composer-options: '--no-cache'
                   dependency-versions: 'highest'
+                  working-directory: "${{ matrix.working-directory }}"
 
             - name: Create project
               if: ${{ matrix.create-project }}
@@ -235,7 +236,7 @@ jobs:
                       default-authentication-plugin=mysql_native_password
 
             - name: Install composer dependencies
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v3
               with:
                   composer-options: '--no-cache'
                   dependency-versions: 'highest'

diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         "scheb/2fa-email": "^7.2",
         "scheb/2fa-trusted-device": "^7.2",
         "stof/doctrine-extensions-bundle": "^1.11",
-        "sulu/sulu": "~2.6.5",
+        "sulu/sulu": "2.6.*@dev",
         "symfony/config": "^7.1",
         "symfony/dotenv": "^7.1",
         "symfony/flex": "^1.17 || ^2.0",