Updated PHPStan

Author: ondrejmirtes

composer.json

@@ -13,7 +13,8 @@
 		"php": "~7.1",
 		"phpstan/phpstan": "^0.10",
 		"doctrine/common": "^2.7",
-		"doctrine/orm": "^2.5"
+		"doctrine/orm": "^2.5",
+		"nikic/php-parser": "^4.0"
 	},
 	"require-dev": {
 		"consistence/coding-standard": "^3.0.1",

src/Type/Doctrine/EntityManagerGetRepositoryDynamicReturnTypeExtension.php

@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
@@ -37,7 +38,9 @@ public function getTypeFromMethodCall(
 	): Type
 	{
 		if (count($methodCall->args) === 0) {
-			return $methodReflection->getReturnType();
+			return ParametersAcceptorSelector::selectSingle(
+				$methodReflection->getVariants()
+			)->getReturnType();
 		}
 		$argType = $scope->getType($methodCall->args[0]->value);
 		if (!$argType instanceof ConstantStringType) {

src/Type/Doctrine/ObjectManagerMergeDynamicReturnTypeExtension.php

@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Type;
 
 class ObjectManagerMergeDynamicReturnTypeExtension implements \PHPStan\Type\DynamicMethodReturnTypeExtension
@@ -27,7 +28,9 @@ public function getTypeFromMethodCall(
 	): Type
 	{
 		if (count($methodCall->args) === 0) {
-			return $methodReflection->getReturnType();
+			return ParametersAcceptorSelector::selectSingle(
+				$methodReflection->getVariants()
+			)->getReturnType();
 		}
 
 		return $scope->getType($methodCall->args[0]->value);