Skip to content
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@v5
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ debug-config-test: .make.config.build.debug
touch $@

.make.install.composer-dependencies:
composer update 'laminas/*' cocur/slugify
composer update 'laminas/*' cocur/slugify google/cloud-storage -W
composer install
composer install -d recovery/common
composer bin all install
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
20 changes: 10 additions & 10 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.46.0",
"guzzlehttp/guzzle": "~7.9.0",
"guzzlehttp/psr7": "~2.7.0",
"laminas/laminas-code": "4.7.1 || 4.16.0",
Expand All @@ -64,29 +64,29 @@
"mpdf/mpdf": "8.2.5",
"ongr/elasticsearch-dsl": "7.2.2",
"psr/link": "1.0.0",
"psr/log": "1.1.4",
"psr/log": "^1 || ^2 || ^3",
"ramsey/uuid": "4.2.3",
"setasign/fpdf": "1.8.6",
"setasign/fpdi": "2.6.3",
"stecman/symfony-console-completion": "0.11.0",
"superbalist/flysystem-google-storage": "7.2.2",
"symfony/config": "~4.4.34",
"symfony/console": "~4.4.34",
"symfony/dependency-injection": "~4.4.34",
"symfony/config": "~5.0.0",
"symfony/console": "~5.3.0",
"symfony/dependency-injection": "~5.0.0",
"symfony/expression-language": "~4.4.34",
"symfony/filesystem": "~4.4.27",
"symfony/finder": "~4.4.30",
"symfony/form": "~4.4.34",
"symfony/form": "~5.0.0",
"symfony/http-foundation": "~4.4.34",
"symfony/http-kernel": "~4.4.34",
"symfony/options-resolver": "~4.4.30",
"symfony/http-kernel": "~5.0.0",
"symfony/options-resolver": "~5.0.0",
"symfony/polyfill-php80": "^1.23",
"symfony/polyfill-php81": "^1.23",
"symfony/polyfill-php82": "^1.26",
"symfony/polyfill-php83": "^1.28",
"symfony/process": "~5.4.46",
"symfony/serializer": "~5.4.0",
"symfony/validator": "~4.4.34",
"symfony/validator": "~5.0.0",
"symfony/web-link": "~4.4.27",
"voku/anti-xss": "~4.1.41",
"wikimedia/less.php": "5.1.2"
Expand Down
Loading
Loading