From 1475c459bdc981f8e41f961673ead53656b6f1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Wed, 9 Aug 2023 20:07:46 +0100 Subject: [PATCH 1/2] qa: Update GHA workflow for PHPUnit 10.2 and 10.3 --- .github/workflows/tests.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1b7fc6b..65a0852 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,6 +22,8 @@ jobs: - '7.1' - '7.0' phpunit-version: + - '10.3.0' + - '10.2.0' - '10.1.0' - '10.0.0' - '9.6.0' @@ -143,6 +145,10 @@ jobs: phpunit-version: '6.0.0' # PHP 8.0 Exclusions + - php-version: '8.0' + phpunit-version: '10.3.0' + - php-version: '8.0' + phpunit-version: '10.2.0' - php-version: '8.0' phpunit-version: '10.1.0' - php-version: '8.0' @@ -189,6 +195,10 @@ jobs: phpunit-version: '6.0.0' # PHP 7.4 Exclusions + - php-version: '7.4' + phpunit-version: '10.3.0' + - php-version: '7.4' + phpunit-version: '10.2.0' - php-version: '7.4' phpunit-version: '10.1.0' - php-version: '7.4' @@ -221,12 +231,20 @@ jobs: phpunit-version: '6.0.0' # PHP 7.3 Exclusions + - php-version: '7.3' + phpunit-version: '10.3.0' + - php-version: '7.3' + phpunit-version: '10.2.0' - php-version: '7.3' phpunit-version: '10.1.0' - php-version: '7.3' phpunit-version: '10.0.0' # PHP 7.2 Exclusions + - php-version: '7.2' + phpunit-version: '10.3.0' + - php-version: '7.2' + phpunit-version: '10.2.0' - php-version: '7.2' phpunit-version: '10.1.0' - php-version: '7.2' @@ -247,6 +265,10 @@ jobs: phpunit-version: '9.0.0' # PHP 7.1 Exclusions + - php-version: '7.1' + phpunit-version: '10.3.0' + - php-version: '7.1' + phpunit-version: '10.2.0' - php-version: '7.1' phpunit-version: '10.1.0' - php-version: '7.1' @@ -279,6 +301,10 @@ jobs: phpunit-version: '8.0.0' # PHP 7.0 Exclusions + - php-version: '7.0' + phpunit-version: '10.3.0' + - php-version: '7.0' + phpunit-version: '10.2.0' - php-version: '7.0' phpunit-version: '10.1.0' - php-version: '7.0' From 1dfcf667231ceaf4178f10a6f383b09a8572f85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Mon, 28 Aug 2023 09:58:08 +0100 Subject: [PATCH 2/2] try use parameters getter - per @MekkiLakhdher --- classes/DefaultArgumentRemoverReturnTypes100.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/DefaultArgumentRemoverReturnTypes100.php b/classes/DefaultArgumentRemoverReturnTypes100.php index 41fdcba..f0a1007 100644 --- a/classes/DefaultArgumentRemoverReturnTypes100.php +++ b/classes/DefaultArgumentRemoverReturnTypes100.php @@ -38,7 +38,7 @@ public function matches(Invocation $invocation) : bool $iClass ? Invocation::class : Invocation\StaticInvocation::class ); } else { - MockFunctionGenerator::removeDefaultArguments($invocation->parameters); + MockFunctionGenerator::removeDefaultArguments($invocation->parameters()); } return false; @@ -73,7 +73,7 @@ public function toString() : string private function removeDefaultArguments(Invocation $invocation, string $class) { $remover = function () { - MockFunctionGenerator::removeDefaultArguments($this->parameters); + MockFunctionGenerator::removeDefaultArguments($this->parameters()); }; $remover->bindTo($invocation, $class)();