Skip to content

Commit 8951f95

Browse files
authored
[Upgrade] add Pimcore 12 support and drop support for Pimcore <11.5 (#22)
* [pimcore-12] use Pimcore 12 * [pimcore-12] do not validate composer.json (temporarily) * [pimcore-12] do not check for advisories * [pimcore-12] adapt php versions and run php cs fixer * [pimcore-12] update teamneusta/testing-framework and some clean up * [pimcore-12] separate pimcore 12 registration config * [pimcore-12] drop support of Pimcore <11.5 because Testing Framework did so
1 parent 1dd9cae commit 8951f95

File tree

11 files changed

+103
-705
lines changed

11 files changed

+103
-705
lines changed

.github/workflows/qa.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ jobs:
1919

2020
steps:
2121
- name: Git Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323

2424
- name: PHP Setup
2525
uses: shivammathur/setup-php@v2
2626
with:
27-
php-version: 8.3
27+
php-version: 8.4
2828

2929
- name: Validate composer.json
30-
run: composer validate --strict
30+
run: composer validate --ansi --strict
3131

3232
- name: Install dependencies
33-
uses: ramsey/composer-install@v2
33+
uses: ramsey/composer-install@v3
3434

35-
- name: Check CS-Fixer
35+
- name: Check PHP code style
3636
run: composer cs:check
3737

3838
- name: Check PHPStan

.github/workflows/tests.yaml

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,50 +20,69 @@ jobs:
2020
# from https://ldarren.medium.com/number-of-ways-to-setup-database-in-github-actions-2cd48df9faae
2121
services:
2222
db:
23-
image: mariadb:10.10.2
23+
image: mariadb:10.11.16
2424
env:
2525
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
2626
MYSQL_DATABASE: 'pimcore'
2727
MYSQL_USER: 'pimcore'
2828
MYSQL_PASSWORD: 'pimcore'
29-
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
29+
options: >-
30+
--health-cmd="healthcheck.sh --connect --innodb_initialized"
31+
--health-interval=10s
32+
--health-timeout=5s
33+
--health-retries=3
3034
ports:
3135
- 3306:3306
3236

3337
strategy:
3438
fail-fast: false
3539
matrix:
3640
include:
41+
# Pimcore 11
3742
- php-version: "8.1"
38-
dependencies: "lowest" # Pimcore 10.5.0
43+
dependencies: "lowest" # Pimcore 11.5.0
3944
- php-version: "8.1"
4045
dependencies: "highest" # Pimcore 11.*
46+
- php-version: "8.2"
47+
dependencies: "lowest" # Pimcore 11.5.0
4148
- php-version: "8.2"
4249
dependencies: "highest" # Pimcore 11.*
50+
- php-version: "8.3"
51+
dependencies: "lowest" # Pimcore 11.5.0
4352
- php-version: "8.3"
4453
dependencies: "highest" # Pimcore 11.*
54+
composer-options: "--with=pimcore/pimcore:^11.5"
55+
# Pimcore 12
56+
- php-version: "8.3"
57+
dependencies: "lowest" # Pimcore 12.0.0
58+
composer-options: "--with=pimcore/pimcore:12.0.0"
59+
- php-version: "8.3"
60+
dependencies: "highest" # Pimcore 12.*
61+
- php-version: "8.4"
62+
dependencies: "lowest" # Pimcore 12.0.0
63+
- php-version: "8.4"
64+
dependencies: "highest" # Pimcore 12.*
4565

4666
steps:
47-
- name: Git Checkout
48-
uses: actions/checkout@v4
67+
- name: Checkout
68+
uses: actions/checkout@v6
4969

50-
- name: PHP Setup
70+
- name: Set up PHP
5171
uses: shivammathur/setup-php@v2
5272
with:
5373
php-version: ${{ matrix.php-version }}
5474

5575
- name: Install dependencies
56-
uses: ramsey/composer-install@v2
76+
uses: ramsey/composer-install@v3
5777
with:
5878
dependency-versions: ${{ matrix.dependencies }}
5979
composer-options: ${{ matrix.composer-options }}
6080

61-
- name: Add Pimcore Admin UI
62-
run: composer require --dev pimcore/admin-ui-classic-bundle --no-interaction
63-
if: matrix.dependencies == 'highest'
64-
6581
- name: Execute tests
66-
run: composer tests
6782
env:
6883
MYSQL_HOST: '127.0.0.1'
69-
MYSQL_SERVER_VERSION: 'mariadb-10.11.4'
84+
MYSQL_SERVER_VERSION: '10.11.16-MariaDB'
85+
PIMCORE_ENCRYPTION_SECRET: ${{ secrets.PIMCORE_ENCRYPTION_SECRET }}
86+
PIMCORE_INSTANCE_IDENTIFIER: ${{ secrets.PIMCORE_INSTANCE_IDENTIFIER }}
87+
PIMCORE_PRODUCT_KEY: ${{ secrets.PIMCORE_PRODUCT_KEY }}
88+
run: composer tests

0 commit comments

Comments
 (0)