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
2 changes: 1 addition & 1 deletion .github/workflows/qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: PHP Setup
uses: shivammathur/setup-php@v2
with:
php-version: 8.4
php-version: 8.5

- name: Validate composer.json
run: composer validate --ansi --strict
Expand Down
22 changes: 20 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,27 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: [ "8.1", "8.2", "8.3", "8.4" ]
pimcore-version: [ "^11.5", "^12.0" ]
php-version: [ "8.1", "8.2", "8.3", "8.4", "8.5" ]
pimcore-version: [ "^11.5", "^12.0", "^2026.1" ]
phpunit-version: [ "^9.6", "^10.5" ]
dependencies: [ "highest" ]
exclude:
- php-version: "8.1"
pimcore-version: "^12.0"
- php-version: "8.1"
pimcore-version: "^2026.1"
- php-version: "8.2"
pimcore-version: "^12.0"
- php-version: "8.2"
pimcore-version: "^2026.1"
- php-version: "8.3"
pimcore-version: "^2026.1"
- php-version: "8.4"
pimcore-version: "^11.5"
- php-version: "8.5"
pimcore-version: "^11.5"
- php-version: "8.5"
pimcore-version: "^12.0"
include:
- php-version: "8.1"
pimcore-version: "^11.5"
Expand All @@ -46,6 +56,14 @@ jobs:
pimcore-version: "^12.0"
phpunit-version: "^10.5"
dependencies: "lowest"
- php-version: "8.4"
pimcore-version: "^12.0"
phpunit-version: "^9.6"
dependencies: "lowest"
- php-version: "8.4"
pimcore-version: "^12.0"
phpunit-version: "^10.5"
dependencies: "lowest"

env:
MYSQL_HOST: 127.0.0.1
Expand Down
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
timeout: 10s

php:
image: pimcore/pimcore:php8.4-debug-latest
image: pimcore/pimcore:php8.5-debug-latest
volumes:
- ./:/var/www/html/
environment:
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
}
],
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
"doctrine/persistence": "^3.1",
"phpunit/phpunit": "^9.6 || ^10.5",
"pimcore/admin-ui-classic-bundle": "^1.6 || ^2.0",
"pimcore/pimcore": "^11.5 || ^12.0",
"pimcore/pimcore": "^11.5 || ^12.0 || ^2026.1",
"psr/log": "^2.0 || ^3.0",
"symfony/config": "^6.4 || ^7.3",
"symfony/console": "^6.4 || ^7.3",
Expand Down
Loading