Merge 833f511 into 619f304

mockery · Feb 18, 2014 · c29aa20 · c29aa20
2 parents 619f304 + 833f511
commit c29aa20
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/library/Mockery/Expectation.php b/library/Mockery/Expectation.php
@@ -269,6 +269,7 @@ public function matchArgs(array $args)
                 return false;
             }
         }
+
         return true;
     }
 
@@ -315,8 +316,7 @@ protected function _matchArg($expected, &$actual)
      */
     public function with()
     {
-        $this->_expectedArgs = func_get_args();
-        return $this;
+        return $this->withArgs(func_get_args());
     }
 
     /**
@@ -327,7 +327,11 @@ public function with()
      */
     public function withArgs(array $args)
     {
+        if (empty($args)) {
+            return $this->withNoArgs();
+        }
         $this->_expectedArgs = $args;
+        $this->_noArgsExpectation = false;
         return $this;
     }
 
@@ -339,7 +343,8 @@ public function withArgs(array $args)
     public function withNoArgs()
     {
         $this->_noArgsExpectation = true;
-        return $this->with();
+        $this->_expectedArgs = null;
+        return $this;
     }
 
     /**

diff --git a/tests/Mockery/ExpectationTest.php b/tests/Mockery/ExpectationTest.php
@@ -212,6 +212,24 @@ public function testExpectsArgumentsArray()
         $this->mock->foo(1, 2);
     }
 
+    /**
+     * @expectedException \Mockery\Exception
+     */
+    public function testExpectsArgumentsArrayThrowsExceptionIfPassedEmptyArray()
+    {
+        $this->mock->shouldReceive('foo')->withArgs(array());
+        $this->mock->foo(1, 2);
+    }
+
+    /**
+     * @expectedException \Mockery\Exception
+     */
+    public function testExpectsArgumentsArrayThrowsExceptionIfNoArgumentsPassed()
+    {
+        $this->mock->shouldReceive('foo')->with();
+        $this->mock->foo(1);
+    }
+
     /**
      * @expectedException \Mockery\Exception
      */
@@ -1700,7 +1718,7 @@ public function testMockingDemeterChainsPassesMockeryExpectationToCompositeExpec
     /**
      * @expectedException PHPUnit_Framework_Error_Warning
      * @runInSeparateProcess
-    */
+     */
     public function testPregMatchThrowsDelimiterWarningWithXdebugScreamTurnedOn()
     {
         if (!extension_loaded('xdebug')) {