Trigger an error in patch and throw in next minor

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
mockery · Aug 15, 2023 · e181f30 · e181f30
1 parent d828962
commit e181f30
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/library/Mockery/Expectation.php b/library/Mockery/Expectation.php
@@ -19,6 +19,7 @@
 
 class Expectation implements ExpectationInterface
 {
+    public const ERROR_ZERO_INVOCATION = 'shouldNotReceive(), never(), times(0) chaining additional invocation count methods has been deprecated and will throw an exception in a future version of Mockery';
     /**
      * Mock object to which this expectation belongs
      *
@@ -356,7 +357,7 @@ public function matchArgs(array $args)
     protected function _matchArgs($args)
     {
         $argCount = count($args);
-        for ($i=0; $i<$argCount; $i++) {
+        for ($i = 0; $i < $argCount; $i++) {
             $param =& $args[$i];
             if (!$this->_matchArg($this->_expectedArgs[$i], $param)) {
                 return false;
@@ -728,7 +729,12 @@ public function times($limit = null)
         }
 
         if ($this->_expectedCount === 0) {
-            throw new \InvalidArgumentException('\Mockery\Expectation::shouldNotReceive() method does not accept chaining additional invocation count methods.');
+            @trigger_error(self::ERROR_ZERO_INVOCATION, E_USER_DEPRECATED);
+            // throw new \InvalidArgumentException(self::ERROR_ZERO_INVOCATION);
+        }
+
+        if ($limit === 0) {
+            $this->_countValidators = [];
         }
 
         $this->_expectedCount = $limit;

diff --git a/tests/Unit/Regression/Issue1328Test.php b/tests/Unit/Regression/Issue1328Test.php
@@ -6,6 +6,7 @@
 use InvalidArgumentException;
 use Mockery;
 use Mockery\Exception\InvalidCountException;
+use Mockery\Expectation;
 use PHPUnit\Framework\TestCase;
 
 final class Issue1328Test extends TestCase
@@ -25,7 +26,16 @@ public function testShouldFailWithAnInvocationCountError(): void
 
     public function testThrowsInvalidArgumentExceptionWhenInvocationCountChanges(): void
     {
+        set_error_handler(
+            static function (int $errorCode, string $errorMessage): void {
+                restore_error_handler();
+                throw new InvalidArgumentException($errorMessage, $errorCode);
+            },
+            E_ALL
+        );
+
         $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(Expectation::ERROR_ZERO_INVOCATION);
 
         $mock = Mockery::mock(DateTime::class);
 
@@ -38,7 +48,16 @@ public function testThrowsInvalidArgumentExceptionWhenInvocationCountChanges():
 
     public function testThrowsInvalidArgumentExceptionForChainingAdditionalInvocationCountMethod(): void
     {
+        set_error_handler(
+            static function (int $errorCode, string $errorMessage): void {
+                restore_error_handler();
+                throw new InvalidArgumentException($errorMessage, $errorCode);
+            },
+            E_ALL
+        );
+
         $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(Expectation::ERROR_ZERO_INVOCATION);
 
         $mock = Mockery::mock(DateTime::class);