From 03f69cb770d1f59701779da80952241df21215a3 Mon Sep 17 00:00:00 2001
From: Nuno Maduro <enunomaduro@gmail.com>
Date: Tue, 12 Oct 2021 14:38:29 +0100
Subject: [PATCH] Makes HasFactory generic

---
 .../Database/Eloquent/Factories/HasFactory.php           | 4 ++--
 types/Autoload.php                                       | 9 +++++++++
 types/Database/Eloquent/Collection.php                   | 5 -----
 types/Database/Eloquent/Factories/Factory.php            | 5 -----
 types/Database/Eloquent/Model.php                        | 6 ++++++
 types/Support/Collection.php                             | 5 -----
 6 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 types/Autoload.php
 create mode 100644 types/Database/Eloquent/Model.php

diff --git a/src/Illuminate/Database/Eloquent/Factories/HasFactory.php b/src/Illuminate/Database/Eloquent/Factories/HasFactory.php
index 383899abb6ee..f10281d14100 100644
--- a/src/Illuminate/Database/Eloquent/Factories/HasFactory.php
+++ b/src/Illuminate/Database/Eloquent/Factories/HasFactory.php
@@ -9,7 +9,7 @@ trait HasFactory
      *
      * @param  callable|array|int|null  $count
      * @param  callable|array  $state
-     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     * @return \Illuminate\Database\Eloquent\Factories\Factory<static>
      */
     public static function factory($count = null, $state = [])
     {
@@ -23,7 +23,7 @@ public static function factory($count = null, $state = [])
     /**
      * Create a new factory instance for the model.
      *
-     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     * @return \Illuminate\Database\Eloquent\Factories\Factory<static>
      */
     protected static function newFactory()
     {
diff --git a/types/Autoload.php b/types/Autoload.php
new file mode 100644
index 000000000000..c530f58cf883
--- /dev/null
+++ b/types/Autoload.php
@@ -0,0 +1,9 @@
+<?php
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+
+class User extends Authenticatable
+{
+    use HasFactory;
+}
diff --git a/types/Database/Eloquent/Collection.php b/types/Database/Eloquent/Collection.php
index f1b3527005ad..8c8fb209d8a6 100644
--- a/types/Database/Eloquent/Collection.php
+++ b/types/Database/Eloquent/Collection.php
@@ -1,12 +1,7 @@
 <?php
 
-use Illuminate\Foundation\Auth\User as Authenticatable;
 use function PHPStan\Testing\assertType;
 
-class User extends Authenticatable
-{
-}
-
 $collection = User::all();
 assertType('Illuminate\Database\Eloquent\Collection<int, User>', $collection);
 
diff --git a/types/Database/Eloquent/Factories/Factory.php b/types/Database/Eloquent/Factories/Factory.php
index 902d4d393b8f..0314749aa419 100644
--- a/types/Database/Eloquent/Factories/Factory.php
+++ b/types/Database/Eloquent/Factories/Factory.php
@@ -1,13 +1,8 @@
 <?php
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Foundation\Auth\User as Authenticatable;
 use function PHPStan\Testing\assertType;
 
-class User extends Authenticatable
-{
-}
-
 /**
  * @extends Illuminate\Database\Eloquent\Factories\Factory<User>
  */
diff --git a/types/Database/Eloquent/Model.php b/types/Database/Eloquent/Model.php
new file mode 100644
index 000000000000..3ca5dc05fd7e
--- /dev/null
+++ b/types/Database/Eloquent/Model.php
@@ -0,0 +1,6 @@
+<?php
+
+use function PHPStan\Testing\assertType;
+
+$factory = User::factory();
+assertType('Illuminate\Database\Eloquent\Factories\Factory<User>', $factory);
diff --git a/types/Support/Collection.php b/types/Support/Collection.php
index c11e5f40c6b0..ae2fe45ba18f 100644
--- a/types/Support/Collection.php
+++ b/types/Support/Collection.php
@@ -1,14 +1,9 @@
 <?php
 
 use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Support\Collection;
 use function PHPStan\Testing\assertType;
 
-class User extends Authenticatable
-{
-}
-
 $collection = collect([new User]);
 /** @var Arrayable<int, User> $arrayable */
 $arrayable = [];