Merge pull request #746 from robertbasic/fix/issue745

Allow overriding count validators
mockery · May 14, 2017 · f07e12f · f07e12f
2 parents 4060b00 + 41796c1
commit f07e12f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/library/Mockery/Expectation.php b/library/Mockery/Expectation.php
@@ -625,7 +625,7 @@ public function times($limit = null)
         if (!is_int($limit)) {
             throw new \InvalidArgumentException('The passed Times limit should be an integer value');
         }
-        $this->_countValidators[] = new $this->_countValidatorClass($this, $limit);
+        $this->_countValidators[$this->_countValidatorClass] = new $this->_countValidatorClass($this, $limit);
         $this->_countValidatorClass = 'Mockery\CountValidator\Exact';
         return $this;
     }

diff --git a/tests/Mockery/AllowsExpectsSyntaxTest.php b/tests/Mockery/AllowsExpectsSyntaxTest.php
@@ -96,7 +96,7 @@ public function expectsSetsUpExpectationOfOneCall()
     }
 
     /** @test */
-    public function callVerificationCountCanBeOverridenAfterExpects()
+    public function callVerificationCountCanBeOverridenAfterExpectsThrowsExceptionWhenIncorrectNumberOfCalls()
     {
         $mock = m::mock();
         $mock->expects()->foo(123)->twice();
@@ -106,6 +106,18 @@ public function callVerificationCountCanBeOverridenAfterExpects()
         m::close();
     }
 
+    /** @test */
+    public function callVerificationCountCanBeOverridenAfterExpects()
+    {
+        $mock = m::mock();
+        $mock->expects()->foo(123)->twice();
+
+        $mock->foo(123);
+        $mock->foo(123);
+
+        m::close();
+    }
+
     /** @test */
     public function generateSkipsExpectsMethodIfAlreadyExists()
     {