From 14d568b6b56c957c9ae5330603303a367b21f0e9 Mon Sep 17 00:00:00 2001 From: Simon Podlipsky Date: Fri, 7 Sep 2018 12:55:10 +0200 Subject: [PATCH] Use Mockery\Expectation instead of CompositeExpectation --- ...pectationAfterStubDynamicReturnTypeExtension.php | 2 +- .../ShouldReceiveDynamicReturnTypeExtension.php | 2 +- tests/Mockery/MockeryBarTest.php | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Mockery/Type/ExpectationAfterStubDynamicReturnTypeExtension.php b/src/Mockery/Type/ExpectationAfterStubDynamicReturnTypeExtension.php index e47557f..8903e5c 100644 --- a/src/Mockery/Type/ExpectationAfterStubDynamicReturnTypeExtension.php +++ b/src/Mockery/Type/ExpectationAfterStubDynamicReturnTypeExtension.php @@ -32,7 +32,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type { - return new ObjectType('Mockery\\CompositeExpectation'); + return new ObjectType('Mockery\\Expectation'); } } diff --git a/src/Mockery/Type/ShouldReceiveDynamicReturnTypeExtension.php b/src/Mockery/Type/ShouldReceiveDynamicReturnTypeExtension.php index 878a697..984a494 100644 --- a/src/Mockery/Type/ShouldReceiveDynamicReturnTypeExtension.php +++ b/src/Mockery/Type/ShouldReceiveDynamicReturnTypeExtension.php @@ -24,7 +24,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type { - return new ObjectType('Mockery\\CompositeExpectation'); + return new ObjectType('Mockery\\Expectation'); } } diff --git a/tests/Mockery/MockeryBarTest.php b/tests/Mockery/MockeryBarTest.php index 59bc500..ec96b77 100644 --- a/tests/Mockery/MockeryBarTest.php +++ b/tests/Mockery/MockeryBarTest.php @@ -21,4 +21,17 @@ public function testFooIsCalled(): void self::assertSame('foo', $bar->doFoo()); } + public function testExpectationMethodsAreCalled(): void + { + $bar = new Bar($this->fooMock); + + $this->fooMock + ->shouldReceive('doFoo') + ->once() + ->times(1) + ->andReturn('foo'); + + self::assertSame('foo', $bar->doFoo()); + } + }