Skip to content

Commit 57b92e6

Browse files
committed
Merge pull request php-mock#30 from chrisminett/phpunit-7.4-verify
Update __phpunit_verify() method signature for PHPUnit 7.4 Closes php-mock#30 Fixes php-mock#29
2 parents 92d32f4 + e98c3f5 commit 57b92e6

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ env:
1818
- PHPUNIT_VERSION=~7.1.0
1919
- PHPUNIT_VERSION=~7.2.0
2020
- PHPUNIT_VERSION=~7.3.0
21+
- PHPUNIT_VERSION=~7.4.0
2122

2223
php:
2324
- 7.2
@@ -30,6 +31,8 @@ matrix:
3031
exclude:
3132
- php: 7
3233
env: PHPUNIT_VERSION=dev-master
34+
- php: 7
35+
env: PHPUNIT_VERSION=~7.4.0
3336
- php: 7
3437
env: PHPUNIT_VERSION=~7.3.0
3538
- php: 7

classes/MockObjectProxy.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ public function __phpunit_setOriginalObject($originalObject)
5656
* @SuppressWarnings(PHPMD)
5757
*/
5858
// @codingStandardsIgnoreStart
59-
public function __phpunit_verify()
59+
public function __phpunit_verify(bool $unsetInvocationMocker = true)
6060
{
6161
// @codingStandardsIgnoreEnd
62-
return $this->mockObject->__phpunit_verify();
62+
return $this->mockObject->__phpunit_verify($unsetInvocationMocker);
6363
}
6464

6565
public function expects(Invocation $matcher)

tests/MockObjectProxyTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function provideTestProxiedMethods()
9696
return [
9797
["__phpunit_getInvocationMocker"],
9898
["__phpunit_setOriginalObject", ["bar"]],
99-
["__phpunit_verify"],
99+
["__phpunit_verify", [true]],
100100
];
101101
}
102102
}

0 commit comments

Comments
 (0)