Merge branch 'feature/40-phpunit-8.4'

Close #40 Fix #39
php-mock · Oct 5, 2019 · 7df4bd1 · 7df4bd1
2 parents 04f78fe + dc012f0
commit 7df4bd1
Show file tree

Hide file tree

Showing 14 changed files with 290 additions and 41 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.phpunit.result.cache
+vendor/
+composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,8 @@ cache:
 
 env:
   - PHPUNIT_VERSION=dev-master
+  - PHPUNIT_VERSION=~8.4.0
+  - PHPUNIT_VERSION=~8.3.0
   - PHPUNIT_VERSION=~8.2.0
   - PHPUNIT_VERSION=~8.1.0
   - PHPUNIT_VERSION=~8.0.0
@@ -36,6 +38,10 @@ matrix:
   exclude:
     - php: 7.1
       env: PHPUNIT_VERSION=dev-master
+    - php: 7.1
+      env: PHPUNIT_VERSION=~8.4.0
+    - php: 7.1
+      env: PHPUNIT_VERSION=~8.3.0
     - php: 7.1
       env: PHPUNIT_VERSION=~8.2.0
     - php: 7.1
@@ -44,6 +50,10 @@ matrix:
       env: PHPUNIT_VERSION=~8.0.0
     - php: 7
       env: PHPUNIT_VERSION=dev-master
+    - php: 7
+      env: PHPUNIT_VERSION=~8.4.0
+    - php: 7
+      env: PHPUNIT_VERSION=~8.3.0
     - php: 7
       env: PHPUNIT_VERSION=~8.2.0
     - php: 7

diff --git a/autoload.php b/autoload.php
@@ -1,6 +1,11 @@
 <?php
 
-if (! interface_exists(\PHPUnit\Framework\MockObject\Matcher\Invocation::class)) {
+if (class_exists(\PHPUnit\Framework\MockObject\Rule\InvocationOrder::class)) {
+    class_alias(
+        \PHPUnit\Framework\MockObject\Rule\InvocationOrder::class,
+        \PHPUnit\Framework\MockObject\Matcher\Invocation::class
+    );
+} elseif (! interface_exists(\PHPUnit\Framework\MockObject\Matcher\Invocation::class)) {
     class_alias(
         \PHPUnit_Framework_MockObject_Matcher_Invocation::class,
         \PHPUnit\Framework\MockObject\Matcher\Invocation::class
@@ -30,21 +35,32 @@ class_alias(
     );
 }
 
+if (class_exists(\PHPUnit\Framework\MockObject\Rule\MethodName::class)) {
+    class_alias(
+        \PHPUnit\Framework\MockObject\Rule\MethodName::class,
+        \PHPUnit\Framework\MockObject\Matcher\MethodName::class
+    );
+}
+
 if (! class_exists(\PHPUnit\Framework\MockObject\Matcher\MethodName::class)) {
     class_alias(
         \PHPUnit_Framework_MockObject_Matcher_MethodName::class,
         \PHPUnit\Framework\MockObject\Matcher\MethodName::class
     );
 }
 
-if (! interface_exists(\PHPUnit\Framework\MockObject\Stub\MatcherCollection::class)) {
+if (!class_exists(\PHPUnit\Framework\MockObject\InvocationHandler::class)
+    && !interface_exists(\PHPUnit\Framework\MockObject\Stub\MatcherCollection::class)
+) {
     class_alias(
         \PHPUnit_Framework_MockObject_Stub_MatcherCollection::class,
         \PHPUnit\Framework\MockObject\Stub\MatcherCollection::class
     );
 }
 
-if (! class_exists(\PHPUnit\Framework\MockObject\InvocationMocker::class)) {
+if (!class_exists(\PHPUnit\Framework\MockObject\InvocationHandler::class)
+    && !class_exists(\PHPUnit\Framework\MockObject\InvocationMocker::class)
+) {
     class_alias(
         \PHPUnit_Framework_MockObject_InvocationMocker::class,
         \PHPUnit\Framework\MockObject\InvocationMocker::class
@@ -65,6 +81,11 @@ class_alias(
 }
 
 if (class_exists(\PHPUnit\Runner\Version::class)
+    && version_compare(\PHPUnit\Runner\Version::id(), '8.4.0') >= 0
+) {
+    class_alias(\phpmock\phpunit\DefaultArgumentRemoverReturnTypes84::class, \phpmock\phpunit\DefaultArgumentRemover::class);
+    class_alias(\phpmock\phpunit\MockObjectProxyReturnTypes84::class, \phpmock\phpunit\MockObjectProxy::class);
+} elseif (class_exists(\PHPUnit\Runner\Version::class)
     && version_compare(\PHPUnit\Runner\Version::id(), '8.1.0') >= 0
 ) {
     class_alias(\phpmock\phpunit\DefaultArgumentRemoverReturnTypes::class, \phpmock\phpunit\DefaultArgumentRemover::class);

diff --git a/classes/DefaultArgumentRemoverNoReturnTypes.php b/classes/DefaultArgumentRemoverNoReturnTypes.php
@@ -16,7 +16,6 @@
  */
 class DefaultArgumentRemoverNoReturnTypes implements InvocationInterface
 {
-
     /**
      * @SuppressWarnings(PHPMD)
      */

diff --git a/classes/DefaultArgumentRemoverReturnTypes.php b/classes/DefaultArgumentRemoverReturnTypes.php
@@ -16,7 +16,6 @@
  */
 class DefaultArgumentRemoverReturnTypes implements InvocationInterface
 {
-
     /**
      * @SuppressWarnings(PHPMD)
      */
@@ -31,8 +30,8 @@ public function matches(Invocation $invocation) : bool
     {
         $iClass = class_exists(Invocation::class);
 
-        if ($invocation instanceof Invocation\StaticInvocation
-            || $iClass
+        if ($iClass
+            || $invocation instanceof Invocation\StaticInvocation
         ) {
             $this->removeDefaultArguments(
                 $invocation,

diff --git a/classes/DefaultArgumentRemoverReturnTypes84.php b/classes/DefaultArgumentRemoverReturnTypes84.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace phpmock\phpunit;
+
+use phpmock\generator\MockFunctionGenerator;
+use PHPUnit\Framework\MockObject\Invocation;
+use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
+
+/**
+ * Removes default arguments from the invocation.
+ *
+ * @author Markus Malkusch <[email protected]>
+ * @link bitcoin:1335STSwu9hST4vcMRppEPgENMHD2r1REK Donations
+ * @license http://www.wtfpl.net/txt/copying/ WTFPL
+ * @internal
+ */
+class DefaultArgumentRemoverReturnTypes84 extends InvocationOrder
+{
+    /**
+     * @SuppressWarnings(PHPMD)
+     */
+    public function invokedDo(Invocation $invocation)
+    {
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD)
+     */
+    public function matches(Invocation $invocation) : bool
+    {
+        $iClass = class_exists(Invocation::class);
+
+        if ($iClass
+            || $invocation instanceof Invocation\StaticInvocation
+        ) {
+            $this->removeDefaultArguments(
+                $invocation,
+                $iClass ? Invocation::class : Invocation\StaticInvocation::class
+            );
+        } else {
+            MockFunctionGenerator::removeDefaultArguments($invocation->parameters);
+        }
+
+        return false;
+    }
+
+    public function verify() : void
+    {
+    }
+
+    /**
+     * This method is not defined in the interface, but used in
+     * PHPUnit_Framework_MockObject_InvocationMocker::hasMatchers().
+     *
+     * @return boolean
+     * @see \PHPUnit_Framework_MockObject_InvocationMocker::hasMatchers()
+     */
+    public function hasMatchers()
+    {
+        return false;
+    }
+
+    public function toString() : string
+    {
+        return __CLASS__;
+    }
+
+    /**
+     * Remove default arguments from StaticInvocation or its children (hack)
+     *
+     * @SuppressWarnings(PHPMD)
+     */
+    private function removeDefaultArguments(Invocation $invocation, string $class)
+    {
+        $remover = function () {
+            MockFunctionGenerator::removeDefaultArguments($this->parameters);
+        };
+
+        $remover->bindTo($invocation, $class)();
+    }
+}
diff --git a/classes/MockDisablerPHPUnit6.php b/classes/MockDisablerPHPUnit6.php
@@ -18,7 +18,6 @@
  */
 class MockDisablerPHPUnit6 extends BaseTestListener
 {
-
     /**
      * @var Deactivatable The function mocks.
      */

diff --git a/classes/MockDisablerPHPUnit7.php b/classes/MockDisablerPHPUnit7.php
@@ -18,7 +18,6 @@
  */
 class MockDisablerPHPUnit7 extends BaseTestListener
 {
-
     /**
      * @var Deactivatable The function mocks.
      */

diff --git a/classes/MockObjectProxyNoReturnTypes.php b/classes/MockObjectProxyNoReturnTypes.php
@@ -16,7 +16,6 @@
  */
 class MockObjectProxyNoReturnTypes implements MockObject
 {
-
     /**
      * @var MockObject $mockObject The mock object.
      */

diff --git a/classes/MockObjectProxyReturnTypes.php b/classes/MockObjectProxyReturnTypes.php
@@ -18,12 +18,11 @@
  */
 class MockObjectProxyReturnTypes implements MockObject
 {
-
     /**
      * @var MockObject $mockObject The mock object.
      */
     private $mockObject;
-    
+
     /**
      * Inject the subject.
      *
@@ -33,7 +32,7 @@ public function __construct(MockObject $mockObject)
     {
         $this->mockObject = $mockObject;
     }
-    
+
     /**
      * @SuppressWarnings(PHPMD)
      */

diff --git a/classes/MockObjectProxyReturnTypes84.php b/classes/MockObjectProxyReturnTypes84.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace phpmock\phpunit;
+
+use PHPUnit\Framework\MockObject\Builder\InvocationMocker as BuilderInvocationMocker;
+use PHPUnit\Framework\MockObject\InvocationHandler;
+use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
+use PHPUnit\Framework\MockObject\MockObject;
+use phpmock\integration\MockDelegateFunctionBuilder;
+
+/**
+ * Proxy for PHPUnit's PHPUnit_Framework_MockObject_MockObject.
+ *
+ * @author Markus Malkusch <[email protected]>
+ * @link bitcoin:1335STSwu9hST4vcMRppEPgENMHD2r1REK Donations
+ * @license http://www.wtfpl.net/txt/copying/ WTFPL
+ * @internal
+ */
+class MockObjectProxyReturnTypes84 implements MockObject
+{
+    /**
+     * @var MockObject $mockObject The mock object.
+     */
+    private $mockObject;
+
+    /**
+     * Inject the subject.
+     *
+     * @param MockObject $mockObject   The subject.
+     */
+    public function __construct(MockObject $mockObject)
+    {
+        $this->mockObject = $mockObject;
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD)
+     */
+    // @codingStandardsIgnoreStart
+    public function __phpunit_getInvocationHandler(): InvocationHandler
+    {
+        return $this->mockObject->__phpunit_getInvocationHandler();
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD)
+     */
+    // @codingStandardsIgnoreStart
+    public function __phpunit_setOriginalObject($originalObject) : void
+    {
+        // @codingStandardsIgnoreEnd
+        $this->mockObject->__phpunit_setOriginalObject($originalObject);
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD)
+     */
+    // @codingStandardsIgnoreStart
+    public function __phpunit_verify(bool $unsetInvocationMocker = true) : void
+    {
+        // @codingStandardsIgnoreEnd
+        $this->mockObject->__phpunit_verify($unsetInvocationMocker);
+    }
+
+    public function expects(InvocationOrder $matcher) : BuilderInvocationMocker
+    {
+        return $this->mockObject->expects($matcher)->method(MockDelegateFunctionBuilder::METHOD);
+    }
+
+    /**
+     * This method is not part of the contract but was found in
+     * PHPUnit's mocked_class.tpl.dist.
+     *
+     * @SuppressWarnings(PHPMD)
+     */
+    // @codingStandardsIgnoreStart
+    public function __phpunit_hasMatchers() : bool
+    {
+        // @codingStandardsIgnoreEnd
+        return $this->mockObject->__phpunit_hasMatchers();
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD)
+     */
+    // @codingStandardsIgnoreStart
+    public function __phpunit_setReturnValueGeneration(bool $returnValueGeneration) : void
+    {
+        // @codingStandardsIgnoreEnd
+        $this->mockObject->__phpunit_setReturnValueGeneration($returnValueGeneration);
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
      */
     class DefaultArgumentRemoverNoReturnTypes implements InvocationInterface
     {
         /**
          * @SuppressWarnings(PHPMD)
          */
@@ Expand Down @@