Skip to content

Commit 701df15

Browse files
feat: PHPUnit 13 support (#93)
1 parent 556c3ee commit 701df15

File tree

5 files changed

+28
-4
lines changed

5 files changed

+28
-4
lines changed

.github/workflows/tests.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- '7.1'
2626
- '7.0'
2727
phpunit-version:
28+
- "13.0.0"
2829
- '12.5.0'
2930
- '12.4.0'
3031
- '12.3.0'
@@ -162,6 +163,8 @@ jobs:
162163
phpunit-version: '6.0.0'
163164

164165
# PHP 8.3 Exclusions
166+
- php-version: '8.3'
167+
phpunit-version: '13.0.0'
165168
- php-version: '8.3'
166169
phpunit-version: '9.4.0'
167170
- php-version: '8.3'
@@ -208,6 +211,8 @@ jobs:
208211
phpunit-version: '6.0.0'
209212

210213
# PHP 8.2 Exclusions
214+
- php-version: '8.2'
215+
phpunit-version: '13.0.0'
211216
- php-version: '8.2'
212217
phpunit-version: '12.5.0'
213218
- php-version: '8.2'
@@ -266,6 +271,8 @@ jobs:
266271
phpunit-version: '6.0.0'
267272

268273
# PHP 8.1 Exclusions
274+
- php-version: '8.1'
275+
phpunit-version: '13.0.0'
269276
- php-version: '8.1'
270277
phpunit-version: '12.5.0'
271278
- php-version: '8.1'
@@ -336,6 +343,8 @@ jobs:
336343
phpunit-version: '6.0.0'
337344

338345
# PHP 8.0 Exclusions
346+
- php-version: '8.0'
347+
phpunit-version: '13.0.0'
339348
- php-version: '8.0'
340349
phpunit-version: '12.5.0'
341350
- php-version: '8.0'
@@ -414,6 +423,8 @@ jobs:
414423
phpunit-version: '6.0.0'
415424

416425
# PHP 7.4 Exclusions
426+
- php-version: '7.4'
427+
phpunit-version: '13.0.0'
417428
- php-version: '7.4'
418429
phpunit-version: '12.5.0'
419430
- php-version: '7.4'
@@ -478,6 +489,8 @@ jobs:
478489
phpunit-version: '6.0.0'
479490

480491
# PHP 7.3 Exclusions
492+
- php-version: '7.3'
493+
phpunit-version: '13.0.0'
481494
- php-version: '7.3'
482495
phpunit-version: '12.5.0'
483496
- php-version: '7.3'
@@ -516,6 +529,8 @@ jobs:
516529
phpunit-version: '10.0.0'
517530

518531
# PHP 7.2 Exclusions
532+
- php-version: '7.2'
533+
phpunit-version: '13.0.0'
519534
- php-version: '7.2'
520535
phpunit-version: '12.5.0'
521536
- php-version: '7.2'
@@ -568,6 +583,8 @@ jobs:
568583
phpunit-version: '9.0.0'
569584

570585
# PHP 7.1 Exclusions
586+
- php-version: '7.1'
587+
phpunit-version: '13.0.0'
571588
- php-version: '7.1'
572589
phpunit-version: '12.5.0'
573590
- php-version: '7.1'
@@ -632,6 +649,8 @@ jobs:
632649
phpunit-version: '8.0.0'
633650

634651
# PHP 7.0 Exclusions
652+
- php-version: '7.0'
653+
phpunit-version: '13.0.0'
635654
- php-version: '7.0'
636655
phpunit-version: '12.5.0'
637656
- php-version: '7.0'

autoload.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ class_alias(
2929
}
3030

3131
if (! class_exists(\PHPUnit\Framework\MockObject\Builder\InvocationMocker::class)) {
32-
if (class_exists(\PHPUnit\Framework\MockObject\InvocationStubberImplementation::class)) {
32+
if (interface_exists(\PHPUnit\Framework\MockObject\InvocationMocker::class)) {
33+
class_alias(
34+
\PHPUnit\Framework\MockObject\InvocationMocker::class,
35+
\PHPUnit\Framework\MockObject\Builder\InvocationMocker::class
36+
);
37+
} elseif (class_exists(\PHPUnit\Framework\MockObject\InvocationStubberImplementation::class)) {
3338
class_alias(
3439
\PHPUnit\Framework\MockObject\InvocationStubberImplementation::class,
3540
\PHPUnit\Framework\MockObject\Builder\InvocationMocker::class

classes/MockObjectProxyReturnTypes120.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use phpmock\integration\MockDelegateFunctionBuilder;
66
use PHPUnit\Framework\Constraint\Constraint;
7-
use PHPUnit\Framework\MockObject\InvocationStubberImplementation as BuilderInvocationMocker;
7+
use PHPUnit\Framework\MockObject\Builder\InvocationMocker as BuilderInvocationMocker;
88
use PHPUnit\Framework\MockObject\InvocationStubber;
99
use PHPUnit\Framework\MockObject\InvocationHandler;
1010
use PHPUnit\Framework\MockObject\MockObject;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"require": {
2121
"php": ">=7",
22-
"phpunit/phpunit": "^6 || ^7 || ^8 || ^9 || ^10.0.17 || ^11 || ^12.0.9",
22+
"phpunit/phpunit": "^6 || ^7 || ^8 || ^9 || ^10.0.17 || ^11 || ^12.0.9 || ^13",
2323
"php-mock/php-mock-integration": "^3.0"
2424
},
2525
"require-dev": {

tests/MockObjectProxyTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private function getMethodMatcher($invocationMocker)
9191
if ($hasVersion
9292
&& version_compare(\PHPUnit\Runner\Version::id(), '10.0.0') >= 0
9393
) {
94-
$reflection = new \ReflectionClass(InvocationMocker::class);
94+
$reflection = new \ReflectionObject($invocationMocker);
9595
$property = $reflection->getProperty('matcher');
9696
ReflectionHelper::setAccessible($property);
9797
return $property->getValue($invocationMocker)->methodNameRule();

0 commit comments

Comments
 (0)