Fix calling non-static method without an object

Author: paulbalandan

src/Type/ReflectionHelperGetPrivateMethodInvokerReturnTypeExtension.php

@@ -28,6 +28,9 @@
 
 final class ReflectionHelperGetPrivateMethodInvokerReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension
 {
+    private const OBJECT_AS_STRING_CONTEXT = 0;
+    private const OBJECT_AS_OBJECT_CONTEXT = 1;
+
     /**
      * @param class-string $class
      */
@@ -53,21 +56,25 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
             return null;
         }
 
-        $objectType = $scope->getType($args[0]->value)->getObjectTypeOrClassStringObjectType();
+        $objectType = $scope->getType($args[0]->value);
         $methodType = $scope->getType($args[1]->value);
 
-        if (! $objectType->isObject()->yes()) {
-            return new NeverType(true);
-        }
-
         return TypeTraverser::map($objectType, static function (Type $type, callable $traverse) use ($methodType, $scope, $args, $methodReflection): Type {
             if ($type instanceof UnionType || $type instanceof IntersectionType) {
                 return $traverse($type);
             }
 
+            $context = self::OBJECT_AS_OBJECT_CONTEXT;
+
+            if ($type->isString()->yes()) {
+                $context = self::OBJECT_AS_STRING_CONTEXT;
+            }
+
             $closures = [];
 
-            foreach ($type->getObjectClassReflections() as $classReflection) {
+            $objectType = $type->getObjectTypeOrClassStringObjectType();
+
+            foreach ($objectType->getObjectClassReflections() as $classReflection) {
                 foreach ($methodType->getConstantStrings() as $methodStringType) {
                     $methodName = $methodStringType->getValue();
 
@@ -86,7 +93,15 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
                         $invokedMethodReflection->getNamedArgumentsVariants(),
                     );
 
-                    $returnType = strtolower($methodName) === '__construct' ? $type : $parametersAcceptor->getReturnType();
+                    if (! $invokedMethodReflection->isStatic() && $context === self::OBJECT_AS_STRING_CONTEXT) {
+                        // ReflectionException: Trying to invoke non static method FQCN::method() without an object
+                        $returnType = new NeverType(true);
+                    } elseif (strtolower($methodName) === '__construct') {
+                        // Do not use void as the return type of __construct
+                        $returnType = $objectType;
+                    } else {
+                        $returnType = $parametersAcceptor->getReturnType();
+                    }
 
                     $closures[] = new ClosureType(
                         $parametersAcceptor->getParameters(),
@@ -99,6 +114,10 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
             }
 
             if ($closures === []) {
+                if (! $objectType->isObject()->yes()) {
+                    return new NeverType(true);
+                }
+
                 return ParametersAcceptorSelector::selectFromArgs(
                     $scope,
                     $args,

tests/Type/data/reflection-helper.php

@@ -64,26 +64,26 @@ public function testObjectAsObjectType(): void
 
     public function testClassStringAsObjectType(): void
     {
-        assertType('Closure(): void', self::getPrivateMethodInvoker(self::class, 'testOnFirstClassCallable'));
+        assertType('Closure(): never', self::getPrivateMethodInvoker(self::class, 'testOnFirstClassCallable'));
 
         $object = ModelReturnTypeTransformVisitor::class;
-        assertType('Closure(PhpParser\Node): null', self::getPrivateMethodInvoker($object, 'enterNode'));
+        assertType('Closure(PhpParser\Node): never', self::getPrivateMethodInvoker($object, 'enterNode'));
         assertType(
-            'Closure(array<PhpParser\Node>): (array<PhpParser\Node>|null)',
+            'Closure(array<PhpParser\Node>): never',
             self::getPrivateMethodInvoker($object, 'afterTraverse'),
         );
 
         $object = FactoriesFunctionReturnTypeExtension::class;
         assertType(
-            'Closure(CodeIgniter\PHPStan\Type\FactoriesReturnTypeHelper): CodeIgniter\PHPStan\Type\FactoriesFunctionReturnTypeExtension',
+            'Closure(CodeIgniter\PHPStan\Type\FactoriesReturnTypeHelper): never',
             self::getPrivateMethodInvoker($object, '__construct'),
         );
         assertType(
-            'Closure(PHPStan\Reflection\FunctionReflection): bool',
+            'Closure(PHPStan\Reflection\FunctionReflection): never',
             self::getPrivateMethodInvoker($object, 'isFunctionSupported'),
         );
         assertType(
-            'Closure(PHPStan\Reflection\FunctionReflection, PhpParser\Node\Expr\FuncCall, PHPStan\Analyser\Scope): (PHPStan\Type\Type|null)',
+            'Closure(PHPStan\Reflection\FunctionReflection, PhpParser\Node\Expr\FuncCall, PHPStan\Analyser\Scope): never',
             self::getPrivateMethodInvoker($object, 'getTypeFromFunctionCall'),
         );
     }
@@ -132,7 +132,7 @@ public function testOnClassString(string $object): void
     public function testOnGenericClassString(string $class): void
     {
         assertType(
-            'Closure(Psr\Log\LoggerInterface, CodeIgniter\CLI\Commands): CodeIgniter\Commands\Utilities\ConfigCheck',
+            'Closure(Psr\Log\LoggerInterface, CodeIgniter\CLI\Commands): never',
             self::getPrivateMethodInvoker($class, '__construct'),
         );
     }
@@ -164,7 +164,7 @@ public function testOnUnionOfObjects(object|string $object): void
         assertType(
             sprintf(
                 '%s|%s',
-                '(Closure(CodeIgniter\PHPStan\Type\ServicesReturnTypeHelper): CodeIgniter\PHPStan\Type\ServicesFunctionReturnTypeExtension)',
+                '(Closure(CodeIgniter\PHPStan\Type\ServicesReturnTypeHelper): never)',
                 '(Closure(non-empty-string): CodeIgniter\PHPStan\Tests\Fixtures\Type\ReflectionHelperGetPrivateMethodInvokerTest)',
             ),
             self::getPrivateMethodInvoker($object, '__construct'),
@@ -177,7 +177,7 @@ public function testOnUnionOfObjects(object|string $object): void
     public function testOnUnionOfStringObjectsWithOneNonClass(string $object): void
     {
         assertType(
-            '*NEVER*',
+            'Closure(Psr\Log\LoggerInterface, CodeIgniter\CLI\Commands): never',
             self::getPrivateMethodInvoker($object, '__construct'),
         );
     }