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

task: support PHP 8.3 #25

Merged
merged 3 commits into from
Nov 19, 2024
Merged
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 @@ -23,7 +23,7 @@ jobs:
- name: PHP Setup
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.3

- name: Validate composer.json
run: composer validate --ansi --strict
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ jobs:
dependencies: "lowest" # Pimcore 10.5.0
- php-version: "8.2"
dependencies: "highest" # Pimcore 11.*
- php-version: "8.3"
dependencies: "lowest" # Pimcore 11.*
- php-version: "8.3"
dependencies: "highest" # Pimcore 11.*

env:
MYSQL_HOST: 127.0.0.1
Expand Down
6 changes: 3 additions & 3 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
database:
image: mariadb:10.11.4
image: mariadb:10.11.10
command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci" ]
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
Expand All @@ -16,15 +16,15 @@ services:
timeout: 10s

php:
image: pimcore/pimcore:php8.1-latest
image: pimcore/pimcore:php8.3-latest
volumes:
- ./:/var/www/html/
environment:
# Enable step debugging (will be activated by trigger). See https://xdebug.org/docs/all_settings#mode
XDEBUG_MODE: debug
# Use Host IP from Docker Daemon. See https://xdebug.org/docs/all_settings#client_host
XDEBUG_CLIENT_HOST: "host.docker.internal"
MYSQL_SERVER_VERSION: mariadb-10.11.4
MYSQL_SERVER_VERSION: 10.11.10-MariaDB
extra_hosts:
# See https://gitlab.neusta.de/NSD/p_pimcore/pimcore-project-template/-/blob/2.1.0/compose.dev.yaml#L18-L24
- "host.docker.internal:host-gateway"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"require": {
"php": "~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"pimcore/pimcore": "^10.5 || ^11.0"
},
"require-dev": {
Expand Down
Loading