Refactor library/Mockery/Matcher/* (#1389)

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>

library/Mockery/Matcher/AndAnyOtherArgs.php

@@ -4,32 +4,35 @@
  * Mockery (https://docs.mockery.io/)
  *
  * @copyright https://github.com/mockery/mockery/blob/HEAD/COPYRIGHT.md
- * @license   https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
- * @link      https://github.com/mockery/mockery for the canonical source repository
+ * @license https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
+ * @link https://github.com/mockery/mockery for the canonical source repository
  */
 
 namespace Mockery\Matcher;
 
 class AndAnyOtherArgs extends MatcherAbstract
 {
     /**
-     * Check if the actual value matches the expected.
+     * Return a string representation of this Matcher
      *
-     * @param mixed $actual
-     * @return bool
+     * @return string
      */
-    public function match(&$actual)
+    public function __toString()
     {
-        return true;
+        return '<AndAnyOthers>';
     }
 
     /**
-     * Return a string representation of this Matcher
+     * Check if the actual value matches the expected.
      *
-     * @return string
+     * @template TMixed
+     *
+     * @param TMixed $actual
+     *
+     * @return bool
      */
-    public function __toString()
+    public function match(&$actual)
     {
-        return '<AndAnyOthers>';
+        return true;
     }
 }

library/Mockery/Matcher/Any.php

@@ -4,32 +4,35 @@
  * Mockery (https://docs.mockery.io/)
  *
  * @copyright https://github.com/mockery/mockery/blob/HEAD/COPYRIGHT.md
- * @license   https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
- * @link      https://github.com/mockery/mockery for the canonical source repository
+ * @license https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
+ * @link https://github.com/mockery/mockery for the canonical source repository
  */
 
 namespace Mockery\Matcher;
 
 class Any extends MatcherAbstract
 {
     /**
-     * Check if the actual value matches the expected.
+     * Return a string representation of this Matcher
      *
-     * @param mixed $actual
-     * @return bool
+     * @return string
      */
-    public function match(&$actual)
+    public function __toString()
     {
-        return true;
+        return '<Any>';
     }
 
     /**
-     * Return a string representation of this Matcher
+     * Check if the actual value matches the expected.
      *
-     * @return string
+     * @template TMixed
+     *
+     * @param TMixed $actual
+     *
+     * @return bool
      */
-    public function __toString()
+    public function match(&$actual)
     {
-        return '<Any>';
+        return true;
     }
 }

library/Mockery/Matcher/AnyArgs.php

@@ -4,27 +4,28 @@
  * Mockery (https://docs.mockery.io/)
  *
  * @copyright https://github.com/mockery/mockery/blob/HEAD/COPYRIGHT.md
- * @license   https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
- * @link      https://github.com/mockery/mockery for the canonical source repository
+ * @license https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
+ * @link https://github.com/mockery/mockery for the canonical source repository
  */
 
 namespace Mockery\Matcher;
 
 class AnyArgs extends MatcherAbstract implements ArgumentListMatcher
 {
-    /**
-     * @inheritdoc
-     */
-    public function match(&$actual)
+    public function __toString()
     {
-        return true;
+        return '<Any Arguments>';
     }
 
     /**
-     * @inheritdoc
+     * @template TMixed
+     *
+     * @param TMixed $actual
+     *
+     * @return bool
      */
-    public function __toString()
+    public function match(&$actual)
     {
-        return '<Any Arguments>';
+        return true;
     }
 }

library/Mockery/Matcher/AnyOf.php

@@ -4,33 +4,38 @@
  * Mockery (https://docs.mockery.io/)
  *
  * @copyright https://github.com/mockery/mockery/blob/HEAD/COPYRIGHT.md
- * @license   https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
- * @link      https://github.com/mockery/mockery for the canonical source repository
+ * @license https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
+ * @link https://github.com/mockery/mockery for the canonical source repository
  */
 
 namespace Mockery\Matcher;
 
+use function in_array;
+
 class AnyOf extends MatcherAbstract
 {
     /**
-     * Check if the actual value does not match the expected (in this
-     * case it's specifically NOT expected).
+     * Return a string representation of this Matcher
      *
-     * @param mixed $actual
-     * @return bool
+     * @return string
      */
-    public function match(&$actual)
+    public function __toString()
     {
-        return in_array($actual, $this->_expected, true);
+        return '<AnyOf>';
     }
 
     /**
-     * Return a string representation of this Matcher
+     * Check if the actual value does not match the expected (in this
+     * case it's specifically NOT expected).
      *
-     * @return string
+     * @template TMixed
+     *
+     * @param TMixed $actual
+     *
+     * @return bool
      */
-    public function __toString()
+    public function match(&$actual)
     {
-        return '<AnyOf>';
+        return in_array($actual, $this->_expected, true);
     }
 }

library/Mockery/Matcher/ArgumentListMatcher.php

@@ -4,8 +4,8 @@
  * Mockery (https://docs.mockery.io/)
  *
  * @copyright https://github.com/mockery/mockery/blob/HEAD/COPYRIGHT.md
- * @license   https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
- * @link      https://github.com/mockery/mockery for the canonical source repository
+ * @license https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
+ * @link https://github.com/mockery/mockery for the canonical source repository
  */
 
 namespace Mockery\Matcher;

library/Mockery/Matcher/Closure.php

@@ -4,34 +4,35 @@
  * Mockery (https://docs.mockery.io/)
  *
  * @copyright https://github.com/mockery/mockery/blob/HEAD/COPYRIGHT.md
- * @license   https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
- * @link      https://github.com/mockery/mockery for the canonical source repository
+ * @license https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
+ * @link https://github.com/mockery/mockery for the canonical source repository
  */
 
 namespace Mockery\Matcher;
 
 class Closure extends MatcherAbstract
 {
     /**
-     * Check if the actual value matches the expected.
+     * Return a string representation of this Matcher
      *
-     * @param mixed $actual
-     * @return bool
+     * @return string
      */
-    public function match(&$actual)
+    public function __toString()
     {
-        $closure = $this->_expected;
-        $result = $closure($actual);
-        return $result === true;
+        return '<Closure===true>';
     }
 
     /**
-     * Return a string representation of this Matcher
+     * Check if the actual value matches the expected.
      *
-     * @return string
+     * @template TMixed
+     *
+     * @param TMixed $actual
+     *
+     * @return bool
      */
-    public function __toString()
+    public function match(&$actual)
     {
-        return '<Closure===true>';
+        return ($this->_expected)($actual) === true;
     }
 }

library/Mockery/Matcher/Contains.php

@@ -4,18 +4,40 @@
  * Mockery (https://docs.mockery.io/)
  *
  * @copyright https://github.com/mockery/mockery/blob/HEAD/COPYRIGHT.md
- * @license   https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
- * @link      https://github.com/mockery/mockery for the canonical source repository
+ * @license https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
+ * @link https://github.com/mockery/mockery for the canonical source repository
  */
 
 namespace Mockery\Matcher;
 
+use function array_values;
+use function implode;
+
 class Contains extends MatcherAbstract
 {
+    /**
+     * Return a string representation of this Matcher
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $return = '<Contains[';
+        $elements = [];
+        foreach ($this->_expected as $v) {
+            $elements[] = (string) $v;
+        }
+        $return .= implode(', ', $elements) . ']>';
+        return $return;
+    }
+
     /**
      * Check if the actual value matches the expected.
      *
-     * @param mixed $actual
+     * @template TMixed
+     *
+     * @param TMixed $actual
+     *
      * @return bool
      */
     public function match(&$actual)
@@ -35,20 +57,4 @@ public function match(&$actual)
         }
         return true;
     }
-
-    /**
-     * Return a string representation of this Matcher
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $return = '<Contains[';
-        $elements = array();
-        foreach ($this->_expected as $v) {
-            $elements[] = (string) $v;
-        }
-        $return .= implode(', ', $elements) . ']>';
-        return $return;
-    }
 }

library/Mockery/Matcher/Ducktype.php

@@ -4,40 +4,47 @@
  * Mockery (https://docs.mockery.io/)
  *
  * @copyright https://github.com/mockery/mockery/blob/HEAD/COPYRIGHT.md
- * @license   https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
- * @link      https://github.com/mockery/mockery for the canonical source repository
+ * @license https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
+ * @link https://github.com/mockery/mockery for the canonical source repository
  */
 
 namespace Mockery\Matcher;
 
+use function implode;
+use function is_object;
+use function method_exists;
+
 class Ducktype extends MatcherAbstract
 {
+    /**
+     * Return a string representation of this Matcher
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return '<Ducktype[' . implode(', ', $this->_expected) . ']>';
+    }
+
     /**
      * Check if the actual value matches the expected.
      *
-     * @param mixed $actual
+     * @template TMixed
+     *
+     * @param TMixed $actual
+     *
      * @return bool
      */
     public function match(&$actual)
     {
-        if (!is_object($actual)) {
+        if (! is_object($actual)) {
             return false;
         }
         foreach ($this->_expected as $method) {
-            if (!method_exists($actual, $method)) {
+            if (! method_exists($actual, $method)) {
                 return false;
             }
         }
         return true;
     }
-
-    /**
-     * Return a string representation of this Matcher
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return '<Ducktype[' . implode(', ', $this->_expected) . ']>';
-    }
 }