Skip to content

Commit c9975e4

Browse files
committed
chore: Add PHP 8.4 to test pipeline
# Conflicts: # composer.lock # vendor-bin/cs-fixer/composer.lock
1 parent cbc8b00 commit c9975e4

File tree

9 files changed

+19
-14
lines changed

9 files changed

+19
-14
lines changed

.github/workflows/phpunit.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- '8.1'
3737
- '8.2'
3838
- '8.3'
39+
- '8.4'
3940
runs-on: ubuntu-latest
4041
steps:
4142
- uses: actions/checkout@v5
@@ -53,8 +54,9 @@ jobs:
5354
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
5455
restore-keys: |
5556
${{ runner.os }}-composer-
56-
- run: composer update 'laminas/*' cocur/slugify
57-
- run: make test-phpunit
57+
- name: Run tests
58+
run: make test-phpunit
59+
5860
mysql:
5961
strategy:
6062
matrix:
@@ -101,6 +103,7 @@ jobs:
101103
restore-keys: |
102104
${{ runner.os }}-composer-
103105
- run: make test-phpunit
106+
104107
Code-Coverage:
105108
runs-on: ubuntu-latest
106109
env:
@@ -142,6 +145,7 @@ jobs:
142145
restore-keys: |
143146
${{ runner.os }}-composer-
144147
- run: make test-phpunit-coverage-statistic
148+
145149
es:
146150
runs-on: ubuntu-latest
147151
env:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ debug-config-test: .make.config.build.debug
130130
touch $@
131131

132132
.make.install.composer-dependencies:
133-
composer update 'laminas/*' cocur/slugify
133+
composer update 'laminas/*' cocur/slugify google/cloud-storage -W
134134
composer install
135135
composer install -d recovery/common
136136
composer bin all install

build/build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@
9999
<exec executable="${script.php}" failonerror="true">
100100
<arg value="composer.phar"/>
101101
<arg value="update"/>
102-
<arg value="'laminas/*' cocur/slugify"/>
102+
<arg value="'laminas/*' cocur/slugify google/cloud-storage"/>
103+
<arg value="-W"/>
103104
</exec>
104105

105106
<exec executable="${script.php}" failonerror="true">

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"issues": "https://github.com/shopware5/shopware/issues"
1616
},
1717
"require": {
18-
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
18+
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
1919
"ext-ctype": "*",
2020
"ext-curl": "*",
2121
"ext-date": "*",
@@ -53,7 +53,7 @@
5353
"elasticsearch/elasticsearch": "^7",
5454
"fig/link-util": "1.1.2",
5555
"friendsofphp/proxy-manager-lts": "1.0.18",
56-
"google/cloud-storage": "1.39.0",
56+
"google/cloud-storage": "1.39.0 || 1.46.0",
5757
"guzzlehttp/guzzle": "~7.9.0",
5858
"guzzlehttp/psr7": "~2.7.0",
5959
"laminas/laminas-code": "4.7.1 || 4.16.0",

composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

recovery/common/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
3+
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
44
"knplabs/gaufrette": "0.11.1",
55
"pimple/pimple": "3.5.0",
66
"slim/slim": "2.6.3",

recovery/common/composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor-bin/cs-fixer/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require-dev": {
3-
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
3+
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
44
"ext-ctype": "*",
55
"ext-mbstring": "*",
66
"friendsofphp/php-cs-fixer": "v3.72.0",

vendor-bin/cs-fixer/composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)