Merge pull request #762 from robertbasic/fix/issue755

Fix/issue755
mockery · Jun 22, 2017 · 52cb8bf · 52cb8bf
2 parents a162bb1 + e910927
commit 52cb8bf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/library/Mockery/Matcher/AnyOf.php b/library/Mockery/Matcher/AnyOf.php
@@ -32,7 +32,7 @@ class AnyOf extends MatcherAbstract
     public function match(&$actual)
     {
         foreach ($this->_expected as $exp) {
-            if ($actual === $exp || $actual == $exp) {
+            if ($actual === $exp) {
                 return true;
             }
         }

diff --git a/tests/Mockery/ExpectationTest.php b/tests/Mockery/ExpectationTest.php
@@ -1867,6 +1867,26 @@ public function testAnyOfConstraintThrowsExceptionWhenConstraintUnmatched()
         $this->container->mockery_verify();
     }
 
+    /**
+     * @expectedException \Mockery\Exception
+     */
+    public function testAnyOfConstraintThrowsExceptionWhenTrueIsNotAnExpectedArgument()
+    {
+        $this->mock->shouldReceive('foo')->with(Mockery::anyOf(1, 2))->once();
+        $this->mock->foo(true);
+        $this->container->mockery_verify();
+    }
+
+    /**
+     * @expectedException \Mockery\Exception
+     */
+    public function testAnyOfConstraintThrowsExceptionWhenFalseIsNotAnExpectedArgument()
+    {
+        $this->mock->shouldReceive('foo')->with(Mockery::anyOf(0, 1, 2))->once();
+        $this->mock->foo(false);
+        $this->container->mockery_verify();
+    }
+
     public function testNotAnyOfConstraintMatchesArgument()
     {
         $this->mock->shouldReceive('foo')->with(Mockery::notAnyOf(1, 2))->once();