chore: Add PHP 8.4 to test pipeline

shopware5 · Jun 13, 2024 · 5b8b618 · 5b8b618
1 parent 8882a46
commit 5b8b618
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -36,6 +36,7 @@ jobs:
                     - '8.1'
                     - '8.2'
                     - '8.3'
+                    - '8.4'
         runs-on: ubuntu-latest
         steps:
             -   uses: actions/checkout@v4
@@ -53,8 +54,9 @@ jobs:
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
                     restore-keys: |
                         ${{ runner.os }}-composer-
-            -   run: composer update 'laminas/*' cocur/slugify
-            -   run: make test-phpunit
+            -   name: Run tests
+                run: make test-phpunit
+
     mysql:
         strategy:
             matrix:
@@ -101,6 +103,7 @@ jobs:
                     restore-keys: |
                         ${{ runner.os }}-composer-
             -   run: make test-phpunit
+
     Code-Coverage:
         runs-on: ubuntu-latest
         env:
@@ -142,6 +145,7 @@ jobs:
                     restore-keys: |
                         ${{ runner.os }}-composer-
             -   run: make test-phpunit-coverage-statistic
+
     es:
         runs-on: ubuntu-latest
         env:

diff --git a/Makefile b/Makefile
@@ -130,8 +130,8 @@ debug-config-test: .make.config.build.debug
 	touch $@
 
 .make.install.composer-dependencies:
-	composer update 'laminas/*' cocur/slugify
-	composer install
+	composer update 'laminas/*' cocur/slugify --ignore-platform-req=php+
+	composer install --ignore-platform-req=php+
 	composer install -d recovery/common
 	composer bin all install
 	cp .htaccess.dist .htaccess

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "issues": "https://github.com/shopware5/shopware/issues"
     },
     "require": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-date": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/recovery/common/composer.json b/recovery/common/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "knplabs/gaufrette": "0.11.1",
         "pimple/pimple": "3.5.0",
         "slim/slim": "2.6.3",

diff --git a/recovery/common/composer.lock b/recovery/common/composer.lock
diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json
@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-ctype": "*",
         "ext-mbstring": "*",
         "friendsofphp/php-cs-fixer": "3.57.1",

diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock