Merge pull request #1 from dotdash/master

Update to phpstan 0.10

Author: sascha-egerer

composer.json

@@ -11,8 +11,8 @@
     },
     "require": {
         "php": "~7.0",
-        "phpstan/phpstan": "^0.9",
-        "typo3/cms": "^8.7.0 || ~9.0"
+        "phpstan/phpstan": "^0.10",
+        "typo3/minimal": "^8.7.0 || ~9.0"
     },
     "autoload": {
         "psr-4": {

src/Reflection/RepositoryMethodsClassReflectionExtension.php

@@ -16,7 +16,7 @@ class RepositoryMethodsClassReflectionExtension implements MethodsClassReflectio
      */
     private $broker;
 
-    public function setBroker(Broker $broker)
+    public function setBroker(Broker $broker): void
     {
         $this->broker = $broker;
     }

src/Type/GeneralUtilityDynamicReturnTypeExtension.php

@@ -30,7 +30,7 @@ public function getTypeFromStaticMethodCall(
     ): Type {
         $arg = $methodCall->args[0]->value;
         if (!($arg instanceof \PhpParser\Node\Expr\ClassConstFetch)) {
-            return $methodReflection->getReturnType();
+            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
         }
         $class = $arg->class;
 

src/Type/ObjectManagerDynamicReturnTypeExtension.php

@@ -9,6 +9,7 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 
 class ObjectManagerDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
@@ -30,7 +31,7 @@ public function getTypeFromMethodCall(
     ): Type {
         $arg = $methodCall->args[0]->value;
         if (!($arg instanceof \PhpParser\Node\Expr\ClassConstFetch)) {
-            return $methodReflection->getReturnType();
+            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
         }
         $class = $arg->class;
 

src/Type/ObjectStorageDynamicReturnTypeExtension.php

@@ -9,6 +9,7 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\TypeCombinator;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
@@ -52,6 +53,6 @@ public function getTypeFromMethodCall(
             }
         }
 
-        return $methodReflection->getReturnType();
+        return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
     }
 }

src/Type/RepositoryDynamicReturnTypeExtension.php

@@ -9,6 +9,7 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use TYPO3\CMS\Core\Utility\ClassNamingUtility;
 
 class RepositoryDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
@@ -32,7 +33,7 @@ public function getTypeFromMethodCall(
         $variableType = $scope->getType($methodCall->var);
 
         if (!($variableType instanceof ObjectType) || !is_subclass_of($variableType->getClassName(), $this->getClass())) {
-            return $methodReflection->getReturnType();
+            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
         }
 
         $modelName = ClassNamingUtility::translateRepositoryNameToModelName($variableType->getClassName());