From 41f4cc27f9471a05dda242f9667f320cca04305b Mon Sep 17 00:00:00 2001 From: Sebastian Blank Date: Thu, 29 Feb 2024 10:19:05 +0100 Subject: [PATCH 1/5] PHP 8.3 Support --- .github/workflows/codeception.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml index b216018e..2d864f8f 100644 --- a/.github/workflows/codeception.yml +++ b/.github/workflows/codeception.yml @@ -37,7 +37,7 @@ jobs: - { php-version: 8.0, database: "mariadb:10.3", dependencies: lowest, experimental: false, require_admin_bundle: false } - { php-version: 8.1, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true } - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true } - - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true, require_admin_bundle: true } + - { php-version: 8.3, database: "mariadb:10.11", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true, require_admin_bundle: true } services: redis: image: redis diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index f1536dbe..1bbab6c2 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -28,7 +28,7 @@ jobs: - { php-version: "8.0", dependencies: "lowest", require_admin_bundle: false } - { php-version: "8.1", dependencies: "highest", require_admin_bundle: true } - { php-version: "8.2", dependencies: "highest", require_admin_bundle: true } - - { php-version: "8.2", dependencies: "highest", pimcore_version: "11.x-dev as 11.0.0", phpstan_args: "", experimental: true, require_admin_bundle: true } + - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.0.0", phpstan_args: "", experimental: true, require_admin_bundle: true } steps: - name: "Checkout code" uses: "actions/checkout@v2" diff --git a/composer.json b/composer.json index c21b32ce..0a4c9e19 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "prefer-stable": true, "minimum-stability": "dev", "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "pimcore/pimcore": "^10.6.8 || ^11.0.7", "pimcore/compatibility-bridge-v10": "^1.0", "webonyx/graphql-php": "^15.2.3" From 34718842c2e4164f7974546e23e4fdb3ea30769b Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Tue, 11 Jun 2024 16:14:21 +0200 Subject: [PATCH 2/5] Update codeception.yml --- .github/workflows/codeception.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml index 2d864f8f..cd84d5ac 100644 --- a/.github/workflows/codeception.yml +++ b/.github/workflows/codeception.yml @@ -35,8 +35,8 @@ jobs: matrix: include: - { php-version: 8.0, database: "mariadb:10.3", dependencies: lowest, experimental: false, require_admin_bundle: false } - - { php-version: 8.1, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true } - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true } + - { php-version: 8.3, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true } - { php-version: 8.3, database: "mariadb:10.11", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true, require_admin_bundle: true } services: redis: From c26f1d93202da7818d18cf7b5559d47b0601ffdb Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Tue, 11 Jun 2024 16:14:47 +0200 Subject: [PATCH 3/5] Update static-analysis.yml --- .github/workflows/static-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 1bbab6c2..6804fe2c 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -26,8 +26,8 @@ jobs: matrix: include: - { php-version: "8.0", dependencies: "lowest", require_admin_bundle: false } - - { php-version: "8.1", dependencies: "highest", require_admin_bundle: true } - { php-version: "8.2", dependencies: "highest", require_admin_bundle: true } + - { php-version: "8.3", dependencies: "highest", require_admin_bundle: true } - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.0.0", phpstan_args: "", experimental: true, require_admin_bundle: true } steps: - name: "Checkout code" From f8d474e12524134f94423a25becead7402092004 Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Wed, 12 Jun 2024 08:16:38 +0200 Subject: [PATCH 4/5] Update codeception.yml --- .github/workflows/codeception.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml index cd84d5ac..f14236a4 100644 --- a/.github/workflows/codeception.yml +++ b/.github/workflows/codeception.yml @@ -35,7 +35,6 @@ jobs: matrix: include: - { php-version: 8.0, database: "mariadb:10.3", dependencies: lowest, experimental: false, require_admin_bundle: false } - - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true } - { php-version: 8.3, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true } - { php-version: 8.3, database: "mariadb:10.11", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true, require_admin_bundle: true } services: From de2b326434e4abccf7e67cc9911af0574fcf0eb2 Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Wed, 12 Jun 2024 08:17:03 +0200 Subject: [PATCH 5/5] Update static-analysis.yml --- .github/workflows/static-analysis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 6804fe2c..2e0b3706 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -26,7 +26,6 @@ jobs: matrix: include: - { php-version: "8.0", dependencies: "lowest", require_admin_bundle: false } - - { php-version: "8.2", dependencies: "highest", require_admin_bundle: true } - { php-version: "8.3", dependencies: "highest", require_admin_bundle: true } - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.0.0", phpstan_args: "", experimental: true, require_admin_bundle: true } steps: