Fix not respecting return type of overridden Request::user() method.

src/ReturnTypes/RequestUserExtension.php

@@ -7,14 +7,14 @@
 use Illuminate\Http\Request;
 use Larastan\Larastan\Concerns\HasContainer;
 use Larastan\Larastan\Concerns\LoadsAuthModel;
-use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PhpParser\Node\Expr\MethodCall;
 
 /**
  * @internal
@@ -48,6 +48,10 @@ public function getTypeFromMethodCall(
         MethodCall $methodCall,
         Scope $scope
     ): Type {
+        if ($methodReflection->getDeclaringClass()->getName() !== Request::class) {
+            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        }
+
         $config = $this->getContainer()->get('config');
         $authModel = null;
 

tests/Type/GeneralTypeTest.php

@@ -59,6 +59,7 @@ public static function dataFileAsserts(): iterable
         yield from self::gatherAssertTypes(__DIR__.'/data/view-exists.php');
         yield from self::gatherAssertTypes(__DIR__.'/data/view.php');
         yield from self::gatherAssertTypes(__DIR__.'/data/where-relation.php');
+        yield from self::gatherAssertTypes(__DIR__.'/data/bug-1718.php');
 
         if (version_compare(LARAVEL_VERSION, '10.15.0', '>=')) {
             yield from self::gatherAssertTypes(__DIR__.'/data/model-l10-15.php');

tests/Type/data/bug-1718.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Bug1718;
+
+use Illuminate\Foundation\Http\FormRequest;
+use App\User;
+use function PHPStan\Testing\assertType;
+
+class AuthedRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return parent::user() instanceof User;
+    }
+
+    public function user($guard = null): User
+    {
+        $user = parent::user($guard);
+        if (!$user instanceof User) {
+            abort(403);
+        }
+
+        return $user;
+    }
+}
+
+function test(AuthedRequest $request, FormRequest $formRequest): void
+{
+    assertType('App\User', $request->user());
+    assertType('App\User|null', $formRequest->user());
+}