Merge pull request #30 from chrisminett/phpunit-7.4-verify

Update __phpunit_verify() method signature for PHPUnit 7.4 Closes #30 Fixes #29
php-mock · Oct 7, 2018 · 57b92e6 · 57b92e6
2 parents 92d32f4 + e98c3f5
commit 57b92e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,7 @@ env:
   - PHPUNIT_VERSION=~7.1.0
   - PHPUNIT_VERSION=~7.2.0
   - PHPUNIT_VERSION=~7.3.0
+  - PHPUNIT_VERSION=~7.4.0
 
 php:
   - 7.2
@@ -30,6 +31,8 @@ matrix:
   exclude:
     - php: 7
       env: PHPUNIT_VERSION=dev-master
+    - php: 7
+      env: PHPUNIT_VERSION=~7.4.0
     - php: 7
       env: PHPUNIT_VERSION=~7.3.0
     - php: 7

diff --git a/classes/MockObjectProxy.php b/classes/MockObjectProxy.php
@@ -56,10 +56,10 @@ public function __phpunit_setOriginalObject($originalObject)
      * @SuppressWarnings(PHPMD)
      */
     // @codingStandardsIgnoreStart
-    public function __phpunit_verify()
+    public function __phpunit_verify(bool $unsetInvocationMocker = true)
     {
         // @codingStandardsIgnoreEnd
-        return $this->mockObject->__phpunit_verify();
+        return $this->mockObject->__phpunit_verify($unsetInvocationMocker);
     }
 
     public function expects(Invocation $matcher)

diff --git a/tests/MockObjectProxyTest.php b/tests/MockObjectProxyTest.php
@@ -96,7 +96,7 @@ public function provideTestProxiedMethods()
         return [
             ["__phpunit_getInvocationMocker"],
             ["__phpunit_setOriginalObject", ["bar"]],
-            ["__phpunit_verify"],
+            ["__phpunit_verify", [true]],
         ];
     }
 }