From cb4b5eadf3caaed88cddbd3f9c7f2f95f82410fa Mon Sep 17 00:00:00 2001
From: "Barry vd. Heuvel" <barry@fruitcake.nl>
Date: Mon, 30 Dec 2024 09:44:52 +0100
Subject: [PATCH 1/2] Add meta override for user return types

---
 resources/views/meta.php    |  6 ++++++
 src/Console/MetaCommand.php | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/resources/views/meta.php b/resources/views/meta.php
index 38fb1bb8b..3735218c2 100644
--- a/resources/views/meta.php
+++ b/resources/views/meta.php
@@ -21,6 +21,12 @@
     ]));
 <?php endforeach; ?>
 
+<?php foreach ($userMethods as $method) : ?>
+    override(<?= $method ?>, map([
+        '' => \<?= $userModel ?>::class,
+    ]));
+<?php endforeach; ?>
+
 <?php foreach ($configMethods as $method) : ?>
     override(<?= $method ?>, map([
     <?php foreach ($configValues as $name => $value) : ?>
diff --git a/src/Console/MetaCommand.php b/src/Console/MetaCommand.php
index 7e83cdacb..5c743b194 100644
--- a/src/Console/MetaCommand.php
+++ b/src/Console/MetaCommand.php
@@ -73,6 +73,15 @@ class MetaCommand extends Command
         '\Illuminate\Support\Facades\Config::set()',
     ];
 
+    protected $userMethods = [
+        '\auth()->user()',
+        '\Illuminate\Contracts\Auth\Guard::user()',
+        '\Illuminate\Support\Facades\Auth::user()',
+        '\request()->user()',
+        '\Illuminate\Http\Request::user()',
+        '\Illuminate\Support\Facades\Request::user()'
+    ];
+
     protected $templateCache = [];
 
     /**
@@ -135,6 +144,8 @@ public function handle()
             return gettype($value);
         });
 
+        $defaultUserModel = $this->config->get('auth.providers.users.model', $this->config->get('auth.model', 'App\User'));
+
         $content = $this->view->make('ide-helper::meta', [
             'bindings' => $bindings,
             'methods' => $this->methods,
@@ -143,6 +154,8 @@ public function handle()
             'configValues' => $configValues,
             'expectedArgumentSets' => $this->getExpectedArgumentSets(),
             'expectedArguments' => $this->getExpectedArguments(),
+            'userModel' => $defaultUserModel,
+            'userMethods' => $this->userMethods,
         ])->render();
 
         $filename = $this->option('filename');

From 85b4de206bd4f11bc701d43fd17fa50f57957943 Mon Sep 17 00:00:00 2001
From: laravel-ide-helper <laravel-ide-helper@users.noreply.github.com>
Date: Mon, 30 Dec 2024 08:45:21 +0000
Subject: [PATCH 2/2] composer fix-style

---
 src/Console/MetaCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Console/MetaCommand.php b/src/Console/MetaCommand.php
index 5c743b194..07dcf84c0 100644
--- a/src/Console/MetaCommand.php
+++ b/src/Console/MetaCommand.php
@@ -79,7 +79,7 @@ class MetaCommand extends Command
         '\Illuminate\Support\Facades\Auth::user()',
         '\request()->user()',
         '\Illuminate\Http\Request::user()',
-        '\Illuminate\Support\Facades\Request::user()'
+        '\Illuminate\Support\Facades\Request::user()',
     ];
 
     protected $templateCache = [];