From b093d709305e453f7c502975e0ae6ea5fb927119 Mon Sep 17 00:00:00 2001 From: Luka Dschaak Date: Fri, 29 Nov 2024 18:00:30 +0100 Subject: [PATCH] [update] allow php version 8.3 --- .github/workflows/qa.yaml | 2 +- .github/workflows/tests.yaml | 2 ++ CHANGELOG.md | 6 ++++++ compose.yaml | 2 +- composer.json | 2 +- phpstan.neon | 2 -- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index 16a7742..c761d85 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -24,7 +24,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 --strict diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 640eb22..f219303 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -40,6 +40,8 @@ jobs: dependencies: "highest" # Pimcore 11.* - php-version: "8.2" dependencies: "highest" # Pimcore 11.* + - php-version: "8.3" + dependencies: "highest" # Pimcore 11.* steps: - name: Git Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index a9236a9..35bc44a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 1.3.0 + +### Changes: + +- Allow PHP 8.3 + ## 1.2.0 ### Features: diff --git a/compose.yaml b/compose.yaml index 28d168d..c5c2abb 100644 --- a/compose.yaml +++ b/compose.yaml @@ -16,7 +16,7 @@ services: timeout: 10s php: - image: pimcore/pimcore:php8.2-latest + image: pimcore/pimcore:php8.3-latest volumes: - ./:/var/www/html/ environment: diff --git a/composer.json b/composer.json index 9d38742..4d31445 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ } }, "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "pimcore/pimcore": "^10.5.1 || ^11.0", "symfony/console": "^5.4 || ^6.0", "symfony/finder": "^5.4 || ^6.0", diff --git a/phpstan.neon b/phpstan.neon index 1f52c1b..d109b9d 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,5 +7,3 @@ parameters: bootstrapFiles: - vendor/pimcore/pimcore/stubs/dynamic-constants.php - - checkGenericClassInNonGenericObjectType: false