Merge pull request #1052 from danielsd/fix-and-any-others-matcher

Fix andAnyOthers() to properly match earlier expectations

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## 1.3.2 (XXXX-XX-XX)
+* Fix andAnyOthers() to properly match earlier expectations (#1051)
+
 ## 1.3.1 (2019-12-26)
 * Revert improved exception debugging due to BC breaks (#1032)
 
@@ -24,7 +27,7 @@
 
 ## 1.2.2 (2019-02-13)
 
-* Fix a BC breaking change for PHP 5.6/PHPUnit 5.7.27 (#947) 
+* Fix a BC breaking change for PHP 5.6/PHPUnit 5.7.27 (#947)
 
 ## 1.2.1 (2019-02-07)
 
@@ -67,7 +70,7 @@
 ## 1.0.0 (2017-09-06)
 
 * Destructors (`__destruct`) are stubbed out where it makes sense
-* Allow passing a closure argument to `withArgs()` to validate multiple arguments at once. 
+* Allow passing a closure argument to `withArgs()` to validate multiple arguments at once.
 * `Mockery\Adapter\Phpunit\TestListener` has been rewritten because it
   incorrectly marked some tests as risky. It will no longer verify mock
   expectations but instead check that tests do that themselves. PHPUnit 6 is
@@ -90,7 +93,7 @@
 * BC BREAK - Fix Mockery not trying default expectations if there is any concrete expectation
 * BC BREAK - Mockery's PHPUnit integration will mark a test as risky if it
   thinks one it's exceptions has been swallowed in PHPUnit > 5.7.6. Use `$e->dismiss()` to dismiss.
- 
+
 ## 0.9.4 (XXXX-XX-XX)
 
 * `shouldIgnoreMissing` will respect global `allowMockingNonExistentMethods`

library/Mockery/Expectation.php

@@ -344,8 +344,7 @@ public function matchArgs(array $args)
             reset($this->_expectedArgs);
 
             if ($this->isAndAnyOtherArgumentsMatcher($lastExpectedArgument)) {
-                $argCountToSkipMatching = $argCount - count($this->_expectedArgs);
-                $args = array_slice($args, 0, $argCountToSkipMatching);
+                $args = array_slice($args, 0, array_search($lastExpectedArgument, $this->_expectedArgs, true));
                 return $this->_matchArgs($args);
             }
 

tests/Mockery/ExpectationTest.php

@@ -1081,7 +1081,7 @@ public function testAndAnyOtherConstraintMatchesTheRestOfTheArguments()
     {
         $this->mock->shouldReceive('foo')->with(1, 2, Mockery::andAnyOthers())->twice();
         $this->mock->foo(1, 2, 3, 4, 5);
-        $this->mock->foo(1, 'str', 3, 4);
+        $this->mock->foo(1, 2, 'str', 3, 4);
     }
 
     public function testAndAnyOtherConstraintDoesNotPreventMatchingOfRegularArguments()
@@ -1092,6 +1092,14 @@ public function testAndAnyOtherConstraintDoesNotPreventMatchingOfRegularArgument
         Mockery::close();
     }
 
+    public function testAndAnyOtherConstraintMultipleExpectationsButNoOthers()
+    {
+        $this->mock->shouldReceive('foo')->with('a', Mockery::andAnyOthers())->andReturn('a');
+        $this->mock->shouldReceive('foo')->with('b', Mockery::andAnyOthers())->andReturn('b');
+        $this->assertEquals('a', $this->mock->foo('a'));
+        $this->assertEquals('b', $this->mock->foo('b'));
+    }
+
     public function testArrayConstraintMatchesArgument()
     {
         $this->mock->shouldReceive('foo')->with(Mockery::type('array'))->once();
@@ -2078,7 +2086,7 @@ public function testWetherMockWithInterfaceOnlyCanNotImplementNonExistingMethods
     public function testCountWithBecauseExceptionMessage()
     {
         $this->expectException(InvalidCountException::class);
-        $this->expectExceptionMessageRegexp(
+        $this->expectExceptionMessageRegExp(
             '/Method foo\(<Any Arguments>\) from Mockery_[\d]+ should be called' . PHP_EOL . ' ' .
             'exactly 1 times but called 0 times. Because We like foo/'
         );