Fix MockInterface::shouldHaveReceived() and MockInterface::shouldNotH…

…aveReceived() stub methods
phpstan · Jan 10, 2024 · 88ae859 · 88ae859
1 parent 40dc3e2
commit 88ae859
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/stubs/MockInterface.stub b/stubs/MockInterface.stub
@@ -41,14 +41,14 @@ interface LegacyMockInterface
 
     /**
      * @param null|string $method
-     * @param null|array<string> $args
+     * @param null|array<mixed>|\Closure $args
      * @return Expectation
      */
     public function shouldHaveReceived($method, $args = null);
 
     /**
      * @param null|string $method
-     * @param null|array<string> $args
+     * @param null|array<mixed>|\Closure $args
      * @return Expectation
      */
     public function shouldNotHaveReceived($method, $args = null);

diff --git a/tests/Mockery/MockeryBarTest.php b/tests/Mockery/MockeryBarTest.php
@@ -9,14 +9,18 @@
 class MockeryBarTest extends MockeryTestCase
 {
 
-	/** @var MockInterface|Foo */
+	/** @var MockInterface&Foo */
 	private $fooMock;
 
+	/** @var MockInterface&Foo */
+	private $fooSpy;
+
 	protected function setUp(): void
 	{
 		parent::setUp();
 
 		$this->fooMock = Mockery::mock(Foo::class);
+		$this->fooSpy = Mockery::spy(Foo::class);
 	}
 
 	public function testFooIsCalled(): void
@@ -53,14 +57,24 @@ public function testShouldReceive(): void
 
 	public function testShouldNotHaveReceived(): void
 	{
-		$this->fooMock->shouldNotHaveReceived(null)->withArgs(['bar']);
+		$this->fooSpy->shouldNotHaveReceived(null)->withArgs(['bar']);
+		$this->fooSpy->doBar('ccc');
+		$this->fooSpy->shouldNotHaveReceived('doBar', ['ddd']);
+		$this->fooSpy->shouldNotHaveReceived('doBar', static function (string $arg): bool {
+			return $arg !== 'ccc';
+		});
 	}
 
 	public function testShouldHaveReceived(): void
 	{
-		$this->fooMock->allows('doFoo')->andReturn('bar');
-		self::assertSame('bar', $this->fooMock->doFoo());
-		$this->fooMock->shouldHaveReceived('doFoo')->once();
+		$this->fooSpy->allows('doFoo')->andReturn('bar');
+		self::assertSame('bar', $this->fooSpy->doFoo());
+		$this->fooSpy->shouldHaveReceived('doFoo')->once();
+		$this->fooSpy->doBar('ccc');
+		$this->fooSpy->shouldHaveReceived('doBar', ['ccc']);
+		$this->fooSpy->shouldHaveReceived('doBar', static function (string $arg): bool {
+			return $arg === 'ccc';
+		});
 	}
 
 }
diff --git a/tests/Mockery/data/Foo.php b/tests/Mockery/data/Foo.php
@@ -22,4 +22,7 @@ public function doFoo(): ?string
 		return 'foo';
 	}
 
+	public function doBar(string $arg): void
+	{
+	}
 }