Use Mockery\Expectation instead of CompositeExpectation

phpstan · Sep 9, 2018 · 14d568b · 14d568b
1 parent 2a30b98
commit 14d568b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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());
+	}
+
 }