From d23393516abeaabe9067c2c31990e94e5ae430c2 Mon Sep 17 00:00:00 2001 From: N'Bayramberdiyev Date: Thu, 28 Nov 2024 13:03:48 +0300 Subject: [PATCH 1/4] Require PHP 8.4 --- composer.json | 2 +- composer.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 11e5169..d7ac029 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "license": "MIT", "require": { - "php": "^8.3", + "php": "^8.4", "composer/composer": "^2.7", "guzzlehttp/guzzle": "^7.3", "knplabs/packagist-api": "dev-master", diff --git a/composer.lock b/composer.lock index 90a5208..16d657d 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": "82c8983ce8a810c4310c18bc3b5c00fc", + "content-hash": "8f5be814fbb1b97e48b5bbbcdb604036", "packages": [ { "name": "brick/math", @@ -9689,8 +9689,8 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^8.3" + "php": "^8.4" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } From 6599faa6480290cda9a67b5c015e6667cb4b9703 Mon Sep 17 00:00:00 2001 From: N'Bayramberdiyev Date: Thu, 28 Nov 2024 13:04:13 +0300 Subject: [PATCH 2/4] Add changelog for PHP 8.4 --- app/VirtualPackages/VirtualPackageFactory.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/VirtualPackages/VirtualPackageFactory.php b/app/VirtualPackages/VirtualPackageFactory.php index 4ee9e23..1658733 100644 --- a/app/VirtualPackages/VirtualPackageFactory.php +++ b/app/VirtualPackages/VirtualPackageFactory.php @@ -24,6 +24,7 @@ public static function php(): VirtualPackage new VirtualPackageVersion('8.1', 'https://www.php.net/ChangeLog-8.php#PHP_8_1'), new VirtualPackageVersion('8.2', 'https://www.php.net/ChangeLog-8.php#PHP_8_2'), new VirtualPackageVersion('8.3', 'https://www.php.net/ChangeLog-8.php#PHP_8_3'), + new VirtualPackageVersion('8.4', 'https://www.php.net/ChangeLog-8.php#PHP_8_4'), ] ); } From f850321aed38584387e7d6353841085e79325444 Mon Sep 17 00:00:00 2001 From: N'Bayramberdiyev Date: Thu, 28 Nov 2024 13:04:26 +0300 Subject: [PATCH 3/4] Run CI on PHP 8.4 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f811e0..80ea15c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: - name: 🐘 Setup PHP uses: shivammathur/setup-php@master with: - php-version: "8.3" + php-version: "8.4" tools: composer env: update: true @@ -40,7 +40,7 @@ jobs: - name: 🐘 Setup PHP uses: shivammathur/setup-php@master with: - php-version: "8.3" + php-version: "8.4" tools: composer env: update: true @@ -61,7 +61,7 @@ jobs: - name: 🐘 Setup PHP uses: shivammathur/setup-php@master with: - php-version: "8.3" + php-version: "8.4" tools: composer env: update: true From be2fa5abcd1408ce62ba444adc3466dc4c3dfe0e Mon Sep 17 00:00:00 2001 From: N'Bayramberdiyev Date: Thu, 28 Nov 2024 13:05:56 +0300 Subject: [PATCH 4/4] Extract PHP version into an env var --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80ea15c..e939824 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,9 @@ name: CI on: [push, pull_request_target] +env: + PHP_VERSION: 8.4 + jobs: tests: name: Run tests @@ -13,8 +16,7 @@ jobs: - name: 🐘 Setup PHP uses: shivammathur/setup-php@master with: - php-version: "8.4" - tools: composer + php-version: ${{ env.PHP_VERSION }} env: update: true @@ -40,8 +42,7 @@ jobs: - name: 🐘 Setup PHP uses: shivammathur/setup-php@master with: - php-version: "8.4" - tools: composer + php-version: ${{ env.PHP_VERSION }} env: update: true @@ -61,8 +62,7 @@ jobs: - name: 🐘 Setup PHP uses: shivammathur/setup-php@master with: - php-version: "8.4" - tools: composer + php-version: ${{ env.PHP_VERSION }} env: update: true