From dfc6dac913a8fa439a5b90da3102c2f4a2eab59b Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Tue, 12 Jul 2022 18:10:10 +0200 Subject: [PATCH] [BUGFIX] Never fixate php version in composer.json (#335) --- .github/workflows/continuous-integration.yml | 15 +++++++++++---- composer.json | 5 +---- composer.lock | 7 ++----- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d05e55d5..0ce0311e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -149,9 +149,10 @@ jobs: matrix: php-version: - '8.1' - - 'latest' experimental: [false] include: + - php-version: 'latest' + experimental: true - php-version: 'nightly' experimental: true @@ -186,8 +187,10 @@ jobs: - name: Set platform.php for nightly if: ${{ matrix.php-version == 'nightly' }} run: | - composer install --no-scripts ${{ env.COMPOSER_FLAGS }} + composer install --no-scripts --ignore-platform-reqs ${{ env.COMPOSER_FLAGS }} + composer config platform.php 8.1.99 composer bin phpunit config platform.php 8.1.99 + composer update --lock - name: Install dependencies run: composer install ${{ env.COMPOSER_INSTALL_FLAGS }} ${{ env.COMPOSER_FLAGS }} @@ -428,8 +431,10 @@ jobs: - name: Set platform.php for nightly if: ${{ matrix.php-version == 'nightly' }} run: | - composer install --no-scripts ${{ env.COMPOSER_FLAGS }} + composer install --no-scripts --ignore-platform-reqs ${{ env.COMPOSER_FLAGS }} + composer config platform.php 8.1.99 composer bin phpunit config platform.php 8.1.99 + composer update --lock - name: Install dependencies if: ${{ matrix.dependencies == 'lock' }} @@ -511,8 +516,10 @@ jobs: - name: Set platform.php for nightly if: ${{ matrix.php-version == 'nightly' }} run: | - composer install --no-scripts ${{ env.COMPOSER_FLAGS }} + composer install --no-scripts --ignore-platform-reqs ${{ env.COMPOSER_FLAGS }} + composer config platform.php 8.1.99 composer bin phpunit config platform.php 8.1.99 + composer update --lock - name: Install dependencies if: ${{ matrix.dependencies == 'lock' }} diff --git a/composer.json b/composer.json index df79a8c5..3130fb07 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "source": "https://github.com/TYPO3/get.typo3.org" }, "require": { - "php": ">=8.1.3", + "php": ">=8.1", "ext-ctype": "*", "ext-iconv": "*", "ext-json": "*", @@ -143,9 +143,6 @@ }, "bin-dir": "bin", "optimize-autoloader": true, - "platform": { - "php": "8.1.4" - }, "preferred-install": { "t3g/*": "source", "*": "dist" diff --git a/composer.lock b/composer.lock index db4f0155..164dd363 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": "67cadc3a71b94ea9099694053bb47f75", + "content-hash": "bd26499090833ebe3c6a94ffc865c313", "packages": [ { "name": "composer/ca-bundle", @@ -10707,15 +10707,12 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=8.1.3", + "php": ">=8.1", "ext-ctype": "*", "ext-iconv": "*", "ext-json": "*", "ext-sqlite3": "*" }, "platform-dev": [], - "platform-overrides": { - "php": "8.1.4" - }, "plugin-api-version": "2.3.0" }