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

src/ReturnTypes/RequestUserExtension.php

@@ -35,11 +35,15 @@
         return $methodReflection->getName() === 'user';
     }
 
     public function getTypeFromMethodCall(
         MethodReflection $methodReflection,
         MethodCall $methodCall,
         Scope $scope,
-    ): Type {
+    ): Type|null {
+        if ($methodReflection->getDeclaringClass()->getName() !== Request::class) {
+            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        }
+
         $config     = $this->getContainer()->get('config');
         $authModels = [];
 

tests/Type/GeneralTypeTest.php

@@ -21,6 +21,7 @@ public static function dataFileAsserts(): iterable
         yield from self::gatherAssertTypes(__DIR__ . '/data/benchmark.php');
         yield from self::gatherAssertTypes(__DIR__ . '/data/bug-1346.php');
         yield from self::gatherAssertTypes(__DIR__ . '/data/bug-1565.php');
+        yield from self::gatherAssertTypes(__DIR__ . '/data/bug-1718.php');
         yield from self::gatherAssertTypes(__DIR__ . '/data/bug-1760.php');
         yield from self::gatherAssertTypes(__DIR__ . '/data/bug-1830.php');
         yield from self::gatherAssertTypes(__DIR__ . '/data/carbon.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());
+}