From f9491b62f4d102e38e7ed93018694a7c44ead4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Fri, 5 Dec 2025 07:06:57 +0000 Subject: [PATCH 1/3] chore: Run tests on PHPUnit ~12.5.0 --- .github/workflows/tests.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d6c38f5..8b87748 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,6 +25,7 @@ jobs: - '7.1' - '7.0' phpunit-version: + - '12.5.0' - '12.4.0' - '12.3.0' - '12.2.0' @@ -207,6 +208,8 @@ jobs: phpunit-version: '6.0.0' # PHP 8.2 Exclusions + - php-version: '8.2' + phpunit-version: '12.5.0' - php-version: '8.2' phpunit-version: '12.4.0' - php-version: '8.2' @@ -263,6 +266,8 @@ jobs: phpunit-version: '6.0.0' # PHP 8.1 Exclusions + - php-version: '8.1' + phpunit-version: '12.5.0' - php-version: '8.1' phpunit-version: '12.4.0' - php-version: '8.1' @@ -331,6 +336,8 @@ jobs: phpunit-version: '6.0.0' # PHP 8.0 Exclusions + - php-version: '8.0' + phpunit-version: '12.5.0' - php-version: '8.0' phpunit-version: '12.4.0' - php-version: '8.0' @@ -407,6 +414,8 @@ jobs: phpunit-version: '6.0.0' # PHP 7.4 Exclusions + - php-version: '7.4' + phpunit-version: '12.5.0' - php-version: '7.4' phpunit-version: '12.4.0' - php-version: '7.4' @@ -469,6 +478,8 @@ jobs: phpunit-version: '6.0.0' # PHP 7.3 Exclusions + - php-version: '7.3' + phpunit-version: '12.5.0' - php-version: '7.3' phpunit-version: '12.4.0' - php-version: '7.3' @@ -505,6 +516,8 @@ jobs: phpunit-version: '10.0.0' # PHP 7.2 Exclusions + - php-version: '7.2' + phpunit-version: '12.5.0' - php-version: '7.2' phpunit-version: '12.4.0' - php-version: '7.2' @@ -555,6 +568,8 @@ jobs: phpunit-version: '9.0.0' # PHP 7.1 Exclusions + - php-version: '7.1' + phpunit-version: '12.5.0' - php-version: '7.1' phpunit-version: '12.4.0' - php-version: '7.1' @@ -617,6 +632,8 @@ jobs: phpunit-version: '8.0.0' # PHP 7.0 Exclusions + - php-version: '7.0' + phpunit-version: '12.5.0' - php-version: '7.0' phpunit-version: '12.4.0' - php-version: '7.0' From 8f2e59dfd1ffae50c8f341cf2874c5a3cfc49ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Fri, 5 Dec 2025 07:14:48 +0000 Subject: [PATCH 2/3] fix PHPUnit 12.5.0 notices in tests - use stubs instead of mocks --- tests/MockDisablerTest.php | 2 +- tests/MockObjectProxyTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/MockDisablerTest.php b/tests/MockDisablerTest.php index 4dbadca..bd5eaab 100644 --- a/tests/MockDisablerTest.php +++ b/tests/MockDisablerTest.php @@ -38,7 +38,7 @@ public function testCallback() { $executed = false; $executedWith = null; - $mock = $this->createMock(Deactivatable::class); + $mock = $this->createStub(Deactivatable::class); $disabler = new MockDisabler($mock, static function ($disabler) use (&$executed, &$executedWith) { self::assertInstanceOf(MockDisabler::class, $disabler); diff --git a/tests/MockObjectProxyTest.php b/tests/MockObjectProxyTest.php index 40c52a8..08ec959 100644 --- a/tests/MockObjectProxyTest.php +++ b/tests/MockObjectProxyTest.php @@ -33,7 +33,7 @@ class MockObjectProxyTest extends TestCase */ public function testExpects() { - $matcher = $this->getMockBuilder(Invocation::class)->getMock(); + $matcher = $this->createStub(Invocation::class); if (class_exists(ConfigurableMethod::class)) { if (class_exists(\PHPUnit\Runner\Version::class) From 874fe1e10e15e14ca263e4081d4a15f7be8a3b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Fri, 5 Dec 2025 07:20:03 +0000 Subject: [PATCH 3/3] use createStub if exists --- tests/MockDisablerTest.php | 6 +++++- tests/MockObjectProxyTest.php | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/MockDisablerTest.php b/tests/MockDisablerTest.php index bd5eaab..ca221ac 100644 --- a/tests/MockDisablerTest.php +++ b/tests/MockDisablerTest.php @@ -38,7 +38,11 @@ public function testCallback() { $executed = false; $executedWith = null; - $mock = $this->createStub(Deactivatable::class); + + $mock = method_exists($this, 'createStub') + ? $this->createStub(Deactivatable::class) + : $this->createMock(Deactivatable::class); + $disabler = new MockDisabler($mock, static function ($disabler) use (&$executed, &$executedWith) { self::assertInstanceOf(MockDisabler::class, $disabler); diff --git a/tests/MockObjectProxyTest.php b/tests/MockObjectProxyTest.php index 08ec959..75376cf 100644 --- a/tests/MockObjectProxyTest.php +++ b/tests/MockObjectProxyTest.php @@ -33,7 +33,9 @@ class MockObjectProxyTest extends TestCase */ public function testExpects() { - $matcher = $this->createStub(Invocation::class); + $matcher = method_exists($this, 'createStub') + ? $this->createStub(Invocation::class) + : $this->createMock(Invocation::class); if (class_exists(ConfigurableMethod::class)) { if (class_exists(\PHPUnit\Runner\Version::class)