From b130f0a0d7c64a6623c28380df26267e10c88a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Wed, 15 Apr 2026 11:32:00 +0100 Subject: [PATCH 1/5] chore: Run tests on PHPUnit ~13.1.0 --- .github/workflows/tests.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9d4c30d..e6182a0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,6 +25,7 @@ jobs: - '7.1' - '7.0' phpunit-version: + - "13.1.0" - "13.0.0" - '12.5.0' - '12.4.0' @@ -163,6 +164,8 @@ jobs: phpunit-version: '6.0.0' # PHP 8.3 Exclusions + - php-version: '8.3' + phpunit-version: '13.1.0' - php-version: '8.3' phpunit-version: '13.0.0' - php-version: '8.3' @@ -211,6 +214,8 @@ jobs: phpunit-version: '6.0.0' # PHP 8.2 Exclusions + - php-version: '8.2' + phpunit-version: '13.1.0' - php-version: '8.2' phpunit-version: '13.0.0' - php-version: '8.2' @@ -271,6 +276,8 @@ jobs: phpunit-version: '6.0.0' # PHP 8.1 Exclusions + - php-version: '8.1' + phpunit-version: '13.1.0' - php-version: '8.1' phpunit-version: '13.0.0' - php-version: '8.1' @@ -343,6 +350,8 @@ jobs: phpunit-version: '6.0.0' # PHP 8.0 Exclusions + - php-version: '8.0' + phpunit-version: '13.1.0' - php-version: '8.0' phpunit-version: '13.0.0' - php-version: '8.0' @@ -423,6 +432,8 @@ jobs: phpunit-version: '6.0.0' # PHP 7.4 Exclusions + - php-version: '7.4' + phpunit-version: '13.1.0' - php-version: '7.4' phpunit-version: '13.0.0' - php-version: '7.4' @@ -489,6 +500,8 @@ jobs: phpunit-version: '6.0.0' # PHP 7.3 Exclusions + - php-version: '7.3' + phpunit-version: '13.1.0' - php-version: '7.3' phpunit-version: '13.0.0' - php-version: '7.3' @@ -529,6 +542,8 @@ jobs: phpunit-version: '10.0.0' # PHP 7.2 Exclusions + - php-version: '7.2' + phpunit-version: '13.1.0' - php-version: '7.2' phpunit-version: '13.0.0' - php-version: '7.2' @@ -583,6 +598,8 @@ jobs: phpunit-version: '9.0.0' # PHP 7.1 Exclusions + - php-version: '7.1' + phpunit-version: '13.1.0' - php-version: '7.1' phpunit-version: '13.0.0' - php-version: '7.1' @@ -649,6 +666,8 @@ jobs: phpunit-version: '8.0.0' # PHP 7.0 Exclusions + - php-version: '7.0' + phpunit-version: '13.1.0' - php-version: '7.0' phpunit-version: '13.0.0' - php-version: '7.0' From 5e5fe7231435ad3a066f7fba407ccb458a6c9350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Thu, 16 Apr 2026 19:29:59 +0100 Subject: [PATCH 2/5] Update InvocationHandler instantiation for PHPUnit 13.1 --- tests/MockObjectProxyTest.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/MockObjectProxyTest.php b/tests/MockObjectProxyTest.php index 593b15c..0703d6e 100644 --- a/tests/MockObjectProxyTest.php +++ b/tests/MockObjectProxyTest.php @@ -172,7 +172,13 @@ public static function provideTestProxiedMethods() if (class_exists(\PHPUnit\Runner\Version::class) && version_compare(\PHPUnit\Runner\Version::id(), '8.4.0') >= 0 ) { - $return[] = ['__phpunit_getInvocationHandler', [], new InvocationHandler([], false)]; + $return[] = [ + '__phpunit_getInvocationHandler', + [], + version_compare(\PHPUnit\Runner\Version::id(), '13.1.0') >= 0 + ? new InvocationHandler([], '', false) + : new InvocationHandler([], false) + ]; } else { $return[] = [ '__phpunit_getInvocationMocker', From b3964af9c2f1d04ef611f0a53393af48f9988764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Thu, 16 Apr 2026 19:35:50 +0100 Subject: [PATCH 3/5] Fix InvocationHandler instantiation in tests --- tests/MockObjectProxyTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/MockObjectProxyTest.php b/tests/MockObjectProxyTest.php index 0703d6e..0e6f070 100644 --- a/tests/MockObjectProxyTest.php +++ b/tests/MockObjectProxyTest.php @@ -176,7 +176,7 @@ public static function provideTestProxiedMethods() '__phpunit_getInvocationHandler', [], version_compare(\PHPUnit\Runner\Version::id(), '13.1.0') >= 0 - ? new InvocationHandler([], '', false) + ? new InvocationHandler([], '', true) : new InvocationHandler([], false) ]; } else { From 37284c709ca5acfa12aa172b6fdc7d28bc02eb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Thu, 16 Apr 2026 19:42:41 +0100 Subject: [PATCH 4/5] Fix InvocationHandler instantiation in tests --- tests/MockObjectProxyTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/MockObjectProxyTest.php b/tests/MockObjectProxyTest.php index 0e6f070..0002679 100644 --- a/tests/MockObjectProxyTest.php +++ b/tests/MockObjectProxyTest.php @@ -176,7 +176,7 @@ public static function provideTestProxiedMethods() '__phpunit_getInvocationHandler', [], version_compare(\PHPUnit\Runner\Version::id(), '13.1.0') >= 0 - ? new InvocationHandler([], '', true) + ? new InvocationHandler([], '', false, true) : new InvocationHandler([], false) ]; } else { From ec70a419dacf3f4283f709594e678bbb30d428c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Thu, 16 Apr 2026 21:05:30 +0100 Subject: [PATCH 5/5] Update InvocationHandler instantiation for PHPUnit 13.1 compatibility --- tests/MockObjectProxyTest.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/MockObjectProxyTest.php b/tests/MockObjectProxyTest.php index 0002679..5758ae5 100644 --- a/tests/MockObjectProxyTest.php +++ b/tests/MockObjectProxyTest.php @@ -60,7 +60,9 @@ public function testExpects() if (class_exists(\PHPUnit\Runner\Version::class) && version_compare(\PHPUnit\Runner\Version::id(), '8.4.0') >= 0 ) { - $invocationHandler = new InvocationHandler([$methods], false, true); + $invocationHandler = version_compare(\PHPUnit\Runner\Version::id(), '13.1.0') >= 0 + ? new InvocationHandler([$methods], '', false, true) + : new InvocationHandler([$methods], false, true); $invocationMocker = $invocationHandler->expects($matcher); } else { $invocationMocker = new InvocationMocker( @@ -176,7 +178,7 @@ public static function provideTestProxiedMethods() '__phpunit_getInvocationHandler', [], version_compare(\PHPUnit\Runner\Version::id(), '13.1.0') >= 0 - ? new InvocationHandler([], '', false, true) + ? new InvocationHandler([], '', false) : new InvocationHandler([], false) ]; } else {