Refactor `library/Mockery/CompositeExpectation.php (#1363)

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>

library/Mockery/CompositeExpectation.php

@@ -5,24 +5,61 @@
  *
  * @copyright https://github.com/mockery/mockery/blob/HEAD/COPYRIGHT.md
  * @license   https://github.com/mockery/mockery/blob/HEAD/LICENSE BSD 3-Clause License
+ *
  * @link      https://github.com/mockery/mockery for the canonical source repository
  */
 
 namespace Mockery;
 
+use function array_map;
+use function current;
+use function implode;
+use function reset;
+
 class CompositeExpectation implements ExpectationInterface
 {
     /**
      * Stores an array of all expectations for this composite
      *
-     * @var array
+     * @var array<ExpectationInterface>
+     */
+    protected $_expectations = [];
+
+    /**
+     * Intercept any expectation calls and direct against all expectations
+     *
+     * @param string $method
+     *
+     * @return self
+     */
+    public function __call($method, array $args)
+    {
+        foreach ($this->_expectations as $expectation) {
+            $expectation->{$method}(...$args);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the string summary of this composite expectation
+     *
+     * @return string
      */
-    protected $_expectations = array();
+    public function __toString()
+    {
+        $parts = array_map(static function (ExpectationInterface $expectation): string {
+            return (string) $expectation;
+        }, $this->_expectations);
+
+        return '[' . implode(', ', $parts) . ']';
+    }
 
     /**
      * Add an expectation to the composite
      *
-     * @param \Mockery\Expectation|\Mockery\CompositeExpectation $expectation
+     * @param ExpectationInterface|HigherOrderMessage $expectation
+     *
      * @return void
      */
     public function add($expectation)
@@ -42,26 +79,24 @@ public function andReturn(...$args)
      * Set a return value, or sequential queue of return values
      *
      * @param mixed ...$args
+     *
      * @return self
      */
     public function andReturns(...$args)
     {
-        return call_user_func_array([$this, 'andReturn'], $args);
+        return $this->andReturn(...$args);
     }
 
     /**
-     * Intercept any expectation calls and direct against all expectations
+     * Return the parent mock of the first expectation
      *
-     * @param string $method
-     * @param array $args
-     * @return self
+     * @return LegacyMockInterface|MockInterface
      */
-    public function __call($method, array $args)
+    public function getMock()
     {
-        foreach ($this->_expectations as $expectation) {
-            call_user_func_array(array($expectation, $method), $args);
-        }
-        return $this;
+        reset($this->_expectations);
+        $first = current($this->_expectations);
+        return $first->getMock();
     }
 
     /**
@@ -76,69 +111,41 @@ public function getOrderNumber()
         return $first->getOrderNumber();
     }
 
-    /**
-     * Return the parent mock of the first expectation
-     *
-     * @return \Mockery\MockInterface|\Mockery\LegacyMockInterface
-     */
-    public function getMock()
-    {
-        reset($this->_expectations);
-        $first = current($this->_expectations);
-        return $first->getMock();
-    }
-
     /**
      * Mockery API alias to getMock
      *
-     * @return \Mockery\LegacyMockInterface|\Mockery\MockInterface
+     * @return LegacyMockInterface|MockInterface
      */
     public function mock()
     {
         return $this->getMock();
     }
 
     /**
-     * Starts a new expectation addition on the first mock which is the primary
-     * target outside of a demeter chain
+     * Starts a new expectation addition on the first mock which is the primary target outside of a demeter chain
      *
      * @param mixed ...$args
-     * @return \Mockery\Expectation
+     *
+     * @return Expectation
      */
-    public function shouldReceive(...$args)
+    public function shouldNotReceive(...$args)
     {
         reset($this->_expectations);
         $first = current($this->_expectations);
-        return call_user_func_array(array($first->getMock(), 'shouldReceive'), $args);
+        return $first->getMock()->shouldNotReceive(...$args);
     }
 
     /**
-     * Starts a new expectation addition on the first mock which is the primary
-     * target outside of a demeter chain
+     * Starts a new expectation addition on the first mock which is the primary target, outside of a demeter chain
      *
      * @param mixed ...$args
-     * @return \Mockery\Expectation
+     *
+     * @return Expectation
      */
-    public function shouldNotReceive(...$args)
+    public function shouldReceive(...$args)
     {
         reset($this->_expectations);
         $first = current($this->_expectations);
-        return call_user_func_array(array($first->getMock(), 'shouldNotReceive'), $args);
-    }
-
-    /**
-     * Return the string summary of this composite expectation
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $return = '[';
-        $parts = array();
-        foreach ($this->_expectations as $exp) {
-            $parts[] = (string) $exp;
-        }
-        $return .= implode(', ', $parts) . ']';
-        return $return;
+        return $first->getMock()->shouldReceive(...$args);
     }
 }