From f32b8be2805cb56d30ade5a7f5f72fb7cfbd9f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=A4u=C3=9Fler?= Date: Thu, 14 Nov 2024 10:26:24 +0100 Subject: [PATCH 1/2] [FEATURE] Add support for PHP 8.4 --- .github/workflows/cgl.yaml | 1 + .github/workflows/release.yaml | 2 +- .github/workflows/tests.yaml | 6 ++++-- composer.json | 2 +- composer.lock | 4 ++-- ext_emconf.php | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cgl.yaml b/.github/workflows/cgl.yaml index 1f80d1b..b8a1626 100644 --- a/.github/workflows/cgl.yaml +++ b/.github/workflows/cgl.yaml @@ -19,6 +19,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: + # @todo Use PHP 8.4 once PHP-CS-Fixer supports PHP 8.4 php-version: 8.3 tools: composer:v2, composer-require-checker, composer-unused coverage: none diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5be6bd0..d069aeb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -62,7 +62,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: intl, mbstring, json, zip, curl tools: composer:v2, typo3/tailor diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c62c6f1..41ec74b 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -14,12 +14,14 @@ jobs: strategy: fail-fast: false matrix: - php-version: ["8.1", "8.2", "8.3"] + php-version: ["8.1", "8.2", "8.3", "8.4"] typo3-version: ["11.5", "12.4", "13.0"] dependencies: ["highest", "lowest"] exclude: - php-version: "8.1" typo3-version: "13.0" + - php-version: "8.4" + typo3-version: "11.5" env: typo3DatabaseName: typo3 typo3DatabaseHost: '127.0.0.1' @@ -70,7 +72,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 tools: composer:v2 coverage: pcov diff --git a/composer.json b/composer.json index d885f24..7a1923f 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "ext-mbstring": "*", "psr/http-message": "^1.0 || ^2.0", "symfony/console": "^5.4 || ^6.4 || ^7.0", diff --git a/composer.lock b/composer.lock index 30d4b6d..d13efb5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7976fa091763b39e3cb1925726dd6f9e", + "content-hash": "2c34bc25bd8a70cdf2d52819eeda0827", "packages": [ { "name": "bacon/bacon-qr-code", @@ -10402,7 +10402,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "ext-mbstring": "*" }, "platform-dev": {}, diff --git a/ext_emconf.php b/ext_emconf.php index 0f1258f..4c3a1b9 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -33,7 +33,7 @@ 'constraints' => [ 'depends' => [ 'typo3' => '11.5.0-13.0.99', - 'php' => '8.1.0-8.3.99', + 'php' => '8.1.0-8.4.99', ], ], ]; From 17cf9f9bf26223351ec605978fbff71028d16c77 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:27:52 +0000 Subject: [PATCH 2/2] [TASK] Update typo3fluid/fluid to v4 | datasource | package | from | to | | ---------- | ---------------- | ------ | ----- | | packagist | typo3fluid/fluid | 2.15.0 | 4.0.1 | --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7a1923f..1d373e1 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "typo3/cms-backend": "~11.5.0 || ~12.4.0 || ~13.0.0", "typo3/cms-core": "~11.5.0 || ~12.4.0 || ~13.0.0", "typo3/cms-fluid": "~11.5.0 || ~12.4.0 || ~13.0.0", - "typo3fluid/fluid": "^2.7" + "typo3fluid/fluid": "^2.7 || ^4.0" }, "require-dev": { "armin/editorconfig-cli": "^1.8 || ^2.0",