Skip to content

Commit 72d09ba

Browse files
authored
Allow PHP 8.3 and use MariaDB 10.11.10 for the tests (#29)
1 parent f96bcbe commit 72d09ba

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

.github/workflows/qa.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: PHP Setup
2323
uses: shivammathur/setup-php@v2
2424
with:
25-
php-version: 8.2
25+
php-version: 8.3
2626

2727
- name: Validate composer.json
2828
run: composer validate --ansi --strict

.github/workflows/tests.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,21 @@ jobs:
2828
- php-version: "8.2"
2929
dependencies: "highest"
3030
phpunit-flags: "--fail-on-risky"
31+
- php-version: "8.3"
32+
dependencies: "highest"
33+
phpunit-flags: "--fail-on-risky"
3134

3235
env:
3336
MYSQL_HOST: 127.0.0.1
3437
MYSQL_PORT: 3306
3538
MYSQL_USER: root
3639
MYSQL_PASSWORD: pimcore
3740
MYSQL_DATABASE: pimcore
38-
MYSQL_SERVER_VERSION: "10.11.5-MariaDB"
41+
MYSQL_SERVER_VERSION: "10.11.10-MariaDB"
3942

4043
services:
4144
mariadb:
42-
image: mariadb:10.11.5
45+
image: mariadb:10.11.10
4346
env:
4447
MYSQL_ROOT_PASSWORD: pimcore
4548
options: >-

compose.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
database:
3-
image: mariadb:10.11.4
3+
image: mariadb:10.11.10
44
command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci" ]
55
environment:
66
MYSQL_ALLOW_EMPTY_PASSWORD: yes
@@ -16,11 +16,11 @@ services:
1616
timeout: 10s
1717

1818
php:
19-
image: pimcore/pimcore:php8.2-latest
19+
image: pimcore/pimcore:php8.3-latest
2020
volumes:
2121
- ./:/var/www/html/
2222
environment:
23-
MYSQL_SERVER_VERSION: mariadb-10.11.4
23+
MYSQL_SERVER_VERSION: "10.11.10-MariaDB"
2424
depends_on:
2525
database:
2626
condition: service_healthy

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
],
2121
"require": {
22-
"php": "~8.1.0 || ~8.2.0",
22+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
2323
"doctrine/persistence": "^2.2 || ^3.0",
2424
"phpunit/phpunit": "^9.6.0",
2525
"pimcore/pimcore": "^10.5 || ~11.0.0 || ~11.1.0 || ~11.2.2 || ~11.3.0 || ~11.4.0",

0 commit comments

Comments
 (0)