From c1e9b338c9210547b636831e4600910e2a2522e9 Mon Sep 17 00:00:00 2001
From: Lito <lito@eordes.com>
Date: Wed, 18 Jan 2023 21:56:55 +0100
Subject: [PATCH 1/3] Added Eloquent Model alias at ApplicationProvider

Related https://github.com/psalm/psalm-plugin-laravel/issues/271
---
 src/Providers/ApplicationProvider.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/Providers/ApplicationProvider.php b/src/Providers/ApplicationProvider.php
index 1d23ddf3..1e444f7f 100644
--- a/src/Providers/ApplicationProvider.php
+++ b/src/Providers/ApplicationProvider.php
@@ -7,7 +7,9 @@
 use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Application as LaravelApplication;
+use Illuminate\Foundation\AliasLoader;
 use Laravel\Lumen\Application as LumenApplication;
 use Orchestra\Testbench\Concerns\CreatesApplication;
 
@@ -34,9 +36,30 @@ public static function bootApp(): void
             $app->boot();
         }
 
+        self::bootAppRegister();
+        self::bootAppAlias();
+    }
+
+    /**
+     * @param LaravelApplication $app
+     *
+     * @return void
+     */
+    protected static function bootAppRegister($app): void
+    {
         $app->register(IdeHelperServiceProvider::class);
     }
 
+    /**
+     * @param LaravelApplication $app
+     *
+     * @return void
+     */
+    protected static function bootAppAlias($app): void
+    {
+        AliasLoader::getInstance()->alias('Eloquent', Model::class);
+    }
+
     /**
      * @return LaravelApplication|LumenApplication
      */

From e4f52c4512d91158182490ff0d30d74fc4ec2b9b Mon Sep 17 00:00:00 2001
From: Lito <lito@eordes.com>
Date: Wed, 18 Jan 2023 22:06:31 +0100
Subject: [PATCH 2/3] Fixed bootAppRegister parameter

---
 src/Providers/ApplicationProvider.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Providers/ApplicationProvider.php b/src/Providers/ApplicationProvider.php
index 1e444f7f..03ee3d9c 100644
--- a/src/Providers/ApplicationProvider.php
+++ b/src/Providers/ApplicationProvider.php
@@ -36,7 +36,7 @@ public static function bootApp(): void
             $app->boot();
         }
 
-        self::bootAppRegister();
+        self::bootAppRegister($app);
         self::bootAppAlias();
     }
 
@@ -51,11 +51,9 @@ protected static function bootAppRegister($app): void
     }
 
     /**
-     * @param LaravelApplication $app
-     *
      * @return void
      */
-    protected static function bootAppAlias($app): void
+    protected static function bootAppAlias(): void
     {
         AliasLoader::getInstance()->alias('Eloquent', Model::class);
     }

From 6a16fb46a55fe9117ab1b7ef7834025f93f019e6 Mon Sep 17 00:00:00 2001
From: Lito <lito@eordes.com>
Date: Wed, 18 Jan 2023 22:58:42 +0100
Subject: [PATCH 3/3] Fixed bootAppRegister @param comment

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

diff --git a/src/Providers/ApplicationProvider.php b/src/Providers/ApplicationProvider.php
index 03ee3d9c..27dd5264 100644
--- a/src/Providers/ApplicationProvider.php
+++ b/src/Providers/ApplicationProvider.php
@@ -41,7 +41,7 @@ public static function bootApp(): void
     }
 
     /**
-     * @param LaravelApplication $app
+     * @param LaravelApplication|LumenApplication $app
      *
      * @return void
      */