Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Add PHP 8.4 to test pipeline #2709

Draft
wants to merge 1 commit into
base: 5.7
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -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:
Expand Down Expand Up @@ -101,6 +103,7 @@ jobs:
restore-keys: |
${{ runner.os }}-composer-
- run: make test-phpunit

Code-Coverage:
runs-on: ubuntu-latest
env:
Expand Down Expand Up @@ -142,6 +145,7 @@ jobs:
restore-keys: |
${{ runner.os }}-composer-
- run: make test-phpunit-coverage-statistic

es:
runs-on: ubuntu-latest
env:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@
<exec executable="${script.php}" failonerror="true">
<arg value="composer.phar"/>
<arg value="update"/>
<arg value="'laminas/*' cocur/slugify"/>
<arg value="'laminas/*' cocur/slugify google/cloud-storage"/>
<arg value="-W"/>
</exec>

<exec executable="${script.php}" failonerror="true">
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recovery/common/composer.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions recovery/common/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor-bin/cs-fixer/composer.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions vendor-bin/cs-fixer/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading