From 1c8f6438f2e39ef888d2cd8a7b8a6c223c3033ae Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Thu, 13 Jun 2024 10:38:18 +0200 Subject: [PATCH] chore: Add PHP 8.4 to test pipeline --- .github/workflows/phpunit.yml | 8 ++++++-- Makefile | 4 ++-- build/build.xml | 3 ++- composer.json | 4 ++-- composer.lock | 4 ++-- recovery/common/composer.json | 2 +- recovery/common/composer.lock | 6 +++--- vendor-bin/cs-fixer/composer.json | 2 +- vendor-bin/cs-fixer/composer.lock | 4 ++-- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 95e2d9c217d..0467cb1d1c1 100644 --- 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 index b9e28561d5d..a09345212e7 100644 --- 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 google/cloud-storage -W --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/build/build.xml b/build/build.xml index 97a4b0fdc5d..d82a4e29403 100644 --- a/build/build.xml +++ b/build/build.xml @@ -99,7 +99,8 @@ - + + diff --git a/composer.json b/composer.json index 2c0c47050cb..13b7089647a 100644 --- 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": "*", @@ -53,7 +53,7 @@ "elasticsearch/elasticsearch": "^7", "fig/link-util": "1.1.2", "friendsofphp/proxy-manager-lts": "1.0.18", - "google/cloud-storage": "1.39.0", + "google/cloud-storage": "1.39.0 || 1.42.0", "guzzlehttp/guzzle": "~7.8.0", "guzzlehttp/psr7": "~2.6.1", "laminas/laminas-code": "4.7.1 || 4.13.0", diff --git a/composer.lock b/composer.lock index edaec000392..ac5ff842dbd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "52b4c3cc2fdfd7593526616176faee53", + "content-hash": "2f9b74553b886197e6b9bc32193d67d7", "packages": [ { "name": "aws/aws-crt-php", @@ -10894,7 +10894,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "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/recovery/common/composer.json b/recovery/common/composer.json index cd2632a4d6f..5b6aae28619 100644 --- 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 index 6d60879c133..ce2234900ac 100644 --- a/recovery/common/composer.lock +++ b/recovery/common/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c6ceb3b9ec9de94345bd1d0c524c235a", + "content-hash": "8df4e9948d0a23a80874cfc3b006610b", "packages": [ { "name": "knplabs/gaufrette", @@ -1381,8 +1381,8 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "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" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index 7f8f5650b6e..5d22c10637d 100644 --- 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 index 891bf3c524a..61af0da9b5f 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e911f478dda30d3cc7c2cc787da8380d", + "content-hash": "6010e27402cb1f565816d33a2946b1b1", "packages": [], "packages-dev": [ { @@ -2430,7 +2430,7 @@ "prefer-lowest": false, "platform": [], "platform-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": "*" },