From bfdc2727a062f8bc43e3041abfb8ad23a28299b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 29 Nov 2023 12:28:38 +0100 Subject: [PATCH 1/2] Enhancement: Require and use PHP 8.2 --- .github/workflows/integrate.yaml | 4 ++-- README.md | 2 +- composer.json | 4 ++-- composer.lock | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 0c6428906c..58a6252d7e 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -17,7 +17,7 @@ jobs: strategy: matrix: php-version: - - "7.3" + - "8.2" steps: - name: "Checkout" @@ -60,7 +60,7 @@ jobs: strategy: matrix: php-version: - - "7.3" + - "8.2" steps: - name: "Checkout" diff --git a/README.md b/README.md index 4e92982b2b..39b7c4c47b 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ https://wiki.php.net/web/mirror ## Code requirements -Code must function on a vanilla PHP 7.3 installation. +Code must function on a vanilla PHP 8.2 installation. Please keep this in mind before filing a pull request. ## Contributing diff --git a/composer.json b/composer.json index da51e9d72e..145a5f4b9a 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "source": "https://github.com/php/web-php" }, "require": { - "php": "^7.3" + "php": "~8.2.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4.0" @@ -20,7 +20,7 @@ }, "config": { "platform": { - "php": "7.3.19" + "php": "8.2.0" }, "sort-packages": true } diff --git a/composer.lock b/composer.lock index 4fee8a5b81..24cdfa96ec 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": "6a06604e237d3d91d913c5bec9dd657a", + "content-hash": "123d1b93480b076f46b80daa9e55e4f3", "packages": [], "packages-dev": [ { @@ -2109,11 +2109,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.3" + "php": "~8.2.0" }, "platform-dev": [], "platform-overrides": { - "php": "7.3.19" + "php": "8.2.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From b71ed707a1b3a8d7ad3375430294b8943daa492f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 29 Nov 2023 12:36:15 +0100 Subject: [PATCH 2/2] Fix: Set PHP_CS_FIXER_IGNORE_ENV environment variable --- .github/workflows/integrate.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 58a6252d7e..db2be31a67 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -51,6 +51,8 @@ jobs: - name: "Run friendsofphp/php-cs-fixer" run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --verbose" + env: + PHP_CS_FIXER_IGNORE_ENV: "1" tests: name: "Tests"