From ff6713ba6404f815d9208e1f2632295ae8c577c6 Mon Sep 17 00:00:00 2001 From: Ruud Kamphuis Date: Fri, 25 Aug 2023 11:01:21 +0200 Subject: [PATCH 1/6] Use `ramsey/composer-install` v2 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2bed96..082556e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: ini-values: "zend.assertions=1" - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v1" + uses: "ramsey/composer-install@v2" with: dependency-versions: "${{ matrix.dependencies }}" @@ -91,7 +91,7 @@ jobs: tools: "cs2pr" - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v1" + uses: "ramsey/composer-install@v2" - name: "Install php-cs-fixer" run: composer require "friendsofphp/php-cs-fixer:^2.16" From c457fe5f1342243d565f2673dd22c72e896ea3b5 Mon Sep 17 00:00:00 2001 From: Ruud Kamphuis Date: Fri, 25 Aug 2023 11:01:27 +0200 Subject: [PATCH 2/6] Enable PHP 8.2 on CI --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 082556e..d2f3c0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ jobs: php-version: - "8.0" - "8.1" + - "8.2" dependencies: - "lowest" - "highest" @@ -77,7 +78,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.2" steps: - name: "Checkout" From 035605c3837b0ae65ce6711ecf984ceec6b4b6e7 Mon Sep 17 00:00:00 2001 From: Ruud Kamphuis Date: Fri, 25 Aug 2023 11:04:21 +0200 Subject: [PATCH 3/6] Bump PHP-CS-Fixer to 3.23 --- .github/workflows/ci.yml | 2 +- .php_cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2f3c0e..41bc26f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: uses: "ramsey/composer-install@v2" - name: "Install php-cs-fixer" - run: composer require "friendsofphp/php-cs-fixer:^2.16" + run: composer require "friendsofphp/php-cs-fixer:^3.23" - name: "Run php-cs-fixer" run: "vendor/bin/php-cs-fixer fix --diff --dry-run -v" diff --git a/.php_cs b/.php_cs index 9230168..5090c82 100644 --- a/.php_cs +++ b/.php_cs @@ -20,8 +20,8 @@ For the full copyright and license information, please view the LICENSE file that was distributed with this source code. EOF; -return PhpCsFixer\Config::create() - ->setRules([ +return (new PhpCsFixer\Config()) + ->setRules([ '@PSR2' => true, 'array_syntax' => ['syntax' => 'short'], 'no_unreachable_default_argument_value' => false, From 268d492c1358a136ca50cba7505eb1bc3c13e081 Mon Sep 17 00:00:00 2001 From: Ruud Kamphuis Date: Fri, 25 Aug 2023 11:06:04 +0200 Subject: [PATCH 4/6] Bump phpunit to 9.6.11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 306f271..738ef12 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ }, "require-dev": { "guzzlehttp/promises": "^1.5.0 || ^2.0.0", - "phpunit/phpunit": "^9.5.10", + "phpunit/phpunit": "^9.6.11", "react/promise": "^2.8.0", "webonyx/graphql-php": "^14.0" }, From c1f9e63a176d6c142d8bd0315ae7bcba20dbe4f1 Mon Sep 17 00:00:00 2001 From: Ruud Kamphuis Date: Fri, 25 Aug 2023 11:07:07 +0200 Subject: [PATCH 5/6] Rename to .php-cs-fixer.php --- .php_cs => .php-cs-fixer.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .php_cs => .php-cs-fixer.php (100%) diff --git a/.php_cs b/.php-cs-fixer.php similarity index 100% rename from .php_cs rename to .php-cs-fixer.php From fb20e47ec5c60c52fd9d195817793fce11642a17 Mon Sep 17 00:00:00 2001 From: Ruud Kamphuis Date: Fri, 25 Aug 2023 11:09:19 +0200 Subject: [PATCH 6/6] Require phpunit/php-code-coverage --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 738ef12..d22181b 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,7 @@ }, "require-dev": { "guzzlehttp/promises": "^1.5.0 || ^2.0.0", + "phpunit/php-code-coverage": "^9.2.27", "phpunit/phpunit": "^9.6.11", "react/promise": "^2.8.0", "webonyx/graphql-php": "^14.0"