Support for new names of MockObject and MockBuilder in PHPUnit 6.5

Author: ondrejmirtes

composer.json

@@ -11,7 +11,7 @@
 	},
 	"require": {
 		"php": "~7.0",
-		"phpstan/phpstan": "^0.9",
+		"phpstan/phpstan": "^0.9.1",
 		"phpunit/phpunit": "^6.3"
 	},
 	"require-dev": {

src/Type/PHPUnit/CreateMockDynamicReturnTypeExtension.php

@@ -56,10 +56,10 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			$class = $scope->getClassReflection()->getName();
 		}
 
-		$mockedClassType = new ObjectType($class);
-		$mockType = new ObjectType(\PHPUnit_Framework_MockObject_MockObject::class);
-
-		return TypeCombinator::intersect($mockedClassType, $mockType);
+		return TypeCombinator::intersect(
+			new ObjectType($class),
+			$methodReflection->getReturnType()
+		);
 	}
 
 }

src/Type/PHPUnit/GetMockBuilderDynamicReturnTypeExtension.php

@@ -6,6 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeWithClassName;
 
 class GetMockBuilderDynamicReturnTypeExtension implements \PHPStan\Type\DynamicMethodReturnTypeExtension
 {
@@ -22,29 +23,34 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
+		$mockBuilderType = $methodReflection->getReturnType();
 		if (count($methodCall->args) === 0) {
-			return $methodReflection->getReturnType();
+			return $mockBuilderType;
 		}
 		$arg = $methodCall->args[0]->value;
 		if (!($arg instanceof \PhpParser\Node\Expr\ClassConstFetch)) {
-			return $methodReflection->getReturnType();
+			return $mockBuilderType;
 		}
 
 		$class = $arg->class;
 		if (!($class instanceof \PhpParser\Node\Name)) {
-			return $methodReflection->getReturnType();
+			return $mockBuilderType;
 		}
 
 		$class = (string) $class;
 		if ($class === 'static') {
-			return $methodReflection->getReturnType();
+			return $mockBuilderType;
 		}
 
 		if ($class === 'self') {
 			$class = $scope->getClassReflection()->getName();
 		}
 
-		return new MockBuilderType($class);
+		if (!$mockBuilderType instanceof TypeWithClassName) {
+			throw new \PHPStan\ShouldNotHappenException();
+		}
+
+		return new MockBuilderType($mockBuilderType, $class);
 	}
 
 }

src/Type/PHPUnit/MockBuilderDynamicReturnTypeExtension.php

@@ -4,17 +4,35 @@
 
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\Broker\Broker;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\TypeWithClassName;
 
-class MockBuilderDynamicReturnTypeExtension implements \PHPStan\Type\DynamicMethodReturnTypeExtension
+class MockBuilderDynamicReturnTypeExtension implements \PHPStan\Type\DynamicMethodReturnTypeExtension, \PHPStan\Reflection\BrokerAwareExtension
 {
 
+	/**
+	 * @var \PHPStan\Broker\Broker
+	 */
+	private $broker;
+
+	public function setBroker(Broker $broker)
+	{
+		$this->broker = $broker;
+	}
+
 	public function getClass(): string
 	{
-		return \PHPUnit_Framework_MockObject_MockBuilder::class;
+		$testCase = $this->broker->getClass(\PHPUnit\Framework\TestCase::class);
+		$mockBuilderType = $testCase->getNativeMethod('getMockBuilder')->getReturnType();
+		if (!$mockBuilderType instanceof TypeWithClassName) {
+			throw new \PHPStan\ShouldNotHappenException();
+		}
+
+		return $mockBuilderType->getClassName();
 	}
 
 	public function isMethodSupported(MethodReflection $methodReflection): bool
@@ -40,10 +58,10 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			return $methodReflection->getReturnType();
 		}
 
-		$mockedClassType = new ObjectType($calledOnType->getMockedClass());
-		$mockType = new ObjectType(\PHPUnit_Framework_MockObject_MockObject::class);
-
-		return TypeCombinator::intersect($mockedClassType, $mockType);
+		return TypeCombinator::intersect(
+			new ObjectType($calledOnType->getMockedClass()),
+			$methodReflection->getReturnType()
+		);
 	}
 
 }

src/Type/PHPUnit/MockBuilderType.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Type\PHPUnit;
 
+use PHPStan\Type\TypeWithClassName;
+
 class MockBuilderType extends \PHPStan\Type\ObjectType
 {
 
@@ -10,9 +12,12 @@ class MockBuilderType extends \PHPStan\Type\ObjectType
 	 */
 	private $mockedClass;
 
-	public function __construct(string $mockedClass)
+	public function __construct(
+		TypeWithClassName $mockBuilderType,
+		string $mockedClass
+	)
 	{
-		parent::__construct(\PHPUnit_Framework_MockObject_MockBuilder::class);
+		parent::__construct($mockBuilderType->getClassName());
 		$this->mockedClass = $mockedClass;
 	}