Makes HasFactory generic (#39171)

Author: nunomaduro

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()
     {

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;
+}

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);
 

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>
  */

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);

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 = [];