Merge pull request #598 from davedevelopment/alternative-syntax

Alternative shouldReceive syntax
mockery · Jan 17, 2017 · 2ff6984 · 2ff6984
2 parents b4617ef + 2e4373e
commit 2ff6984
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 19 deletions.
diff --git a/library/Mockery/HigherOrderMessage.php b/library/Mockery/HigherOrderMessage.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Mockery;
+
+class HigherOrderMessage 
+{
+    private $mock;
+    private $method;
+
+    public function __construct(MockInterface $mock, $method)
+    {
+        $this->mock = $mock;
+        $this->method = $method;
+    }
+
+    /**
+     * @return Mockery\Expectation
+     */
+    public function __call($method, $args)
+    {
+        $expectation = $this->mock->{$this->method}($method);
+
+        if ($this->method !== "shouldNotHaveReceived") {
+            return $expectation->withArgs($args);
+        }
+
+        return $expectation;
+    }
+}
diff --git a/library/Mockery/Mock.php b/library/Mockery/Mock.php
@@ -20,6 +20,7 @@
 
 namespace Mockery;
 
+use Mockery\HigherOrderMessage;
 use Mockery\MockInterface;
 
 class Mock implements MockInterface
@@ -175,13 +176,13 @@ public function mockery_init(\Mockery\Container $container = null, $partialObjec
     /**
      * Set expected method calls
      *
-     * @param string $methodName,... one or many methods that are expected to be called in this mock
-     * @return \Mockery\ExpectationInterface
+     * @param null|string $methodName,... one or many methods that are expected to be called in this mock
+     * @return \Mockery\ExpectationInterface|\Mockery\HigherOrderMessage
      */
-    public function shouldReceive($methodName)
+    public function shouldReceive($methodName = null)
     {
-        if (func_num_args() < 1) {
-            throw new \InvalidArgumentException("At least one method name is required");
+        if ($methodName === null) {
+            return new HigherOrderMessage($this, "shouldReceive");
         }
 
         foreach (func_get_args() as $method) {
@@ -224,11 +225,15 @@ public function shouldReceive($methodName)
     /**
      * Shortcut method for setting an expectation that a method should not be called.
      *
-     * @param string $methodName,... one or many methods that are expected not to be called in this mock
-     * @return \Mockery\Expectation
+     * @param null|string $methodName,... one or many methods that are expected not to be called in this mock
+     * @return \Mockery\Expectation|\Mockery\HigherOrderMessage
      */
-    public function shouldNotReceive($methodName)
+    public function shouldNotReceive($methodName = null)
     {
+        if ($methodName === null) {
+            return new HigherOrderMessage($this, "shouldNotReceive");
+        }
+
         $expectation = call_user_func_array(array($this, 'shouldReceive'), func_get_args());
         $expectation->never();
         return $expectation;
@@ -666,8 +671,12 @@ public function mockery_returnValueForMethod($name)
         }
     }
 
-    public function shouldHaveReceived($method, $args = null)
+    public function shouldHaveReceived($method = null, $args = null)
     {
+        if ($method === null) {
+            return new HigherOrderMessage($this, "shouldHaveReceived");
+        }
+
         $expectation = new \Mockery\VerificationExpectation($this, $method);
         if (null !== $args) {
             $expectation->withArgs($args);
@@ -679,8 +688,12 @@ public function shouldHaveReceived($method, $args = null)
         return $director;
     }
 
-    public function shouldNotHaveReceived($method, $args = null)
+    public function shouldNotHaveReceived($method = null, $args = null)
     {
+        if ($method === null) {
+            return new HigherOrderMessage($this, "shouldNotHaveReceived");
+        }
+
         $expectation = new \Mockery\VerificationExpectation($this, $method);
         if (null !== $args) {
             $expectation->withArgs($args);

diff --git a/library/Mockery/MockInterface.php b/library/Mockery/MockInterface.php
@@ -34,16 +34,16 @@ public function mockery_init(\Mockery\Container $container = null, $partialObjec
     /**
      * Set expected method calls
      *
-     * @param string $methodName,... one or many methods that are expected to be called in this mock
-     * @return \Mockery\Expectation
+     * @param null|string $methodName,... one or many methods that are expected to be called in this mock
+     * @return mixed
      */
-    public function shouldReceive($methodName);
+    public function shouldReceive($methodName = null);
 
     /**
      * Shortcut method for setting an expectation that a method should not be called.
      *
-     * @param string $methodName,... one or many methods that are expected not to be called in this mock
-     * @return \Mockery\Expectation
+     * @param null|string $methodName,... one or many methods that are expected not to be called in this mock
+     * @return mixed
      */
     public function shouldNotReceive($methodName);
 
@@ -80,16 +80,16 @@ public function shouldDeferMissing();
     public function makePartial();
 
     /**
-     * @param $method
+     * @param null|string $method
      * @param null $args
-     * @return \Mockery\Expectation
+     * @return mixed
      */
     public function shouldHaveReceived($method, $args = null);
 
     /**
-     * @param $method
+     * @param null|string $method
      * @param null $args
-     * @return null
+     * @return mixed
      */
     public function shouldNotHaveReceived($method, $args = null);