Change __call factory and relation resolution

laravel · Jul 6, 2020 · 223293a · 223293a
1 parent 6209a06
commit 223293a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Factories/Factory.php b/src/Illuminate/Database/Eloquent/Factories/Factory.php
@@ -632,15 +632,18 @@ public function __call($method, $parameters)
             static::throwBadMethodCallException($method);
         }
 
-        $factory = static::factoryForModel(Str::singular(Str::substr($method, 3)));
+        $relationship = Str::camel(Str::substr($method, 3));
+        $related = $this->newModel()->{$relationship}()->getRelated();
+        $factory = static::factoryForModel(get_class($related));
 
         if (Str::startsWith($method, 'for')) {
-            return $this->for($factory->state($parameters[0] ?? []));
+            return $this->for($factory->state($parameters[0] ?? []), $relationship);
         } elseif (Str::startsWith($method, 'has')) {
             return $this->has(
                 $factory
                     ->count(is_numeric($parameters[0] ?? null) ? $parameters[0] : 1)
-                    ->state(is_array($parameters[0] ?? null) ? $parameters[0] : ($parameters[1] ?? []))
+                    ->state(is_array($parameters[0] ?? null) ? $parameters[0] : ($parameters[1] ?? [])),
+                $relationship
             );
         }
     }

diff --git a/tests/Database/DatabaseEloquentFactoryTest.php b/tests/Database/DatabaseEloquentFactoryTest.php
@@ -5,6 +5,7 @@
 use Illuminate\Container\Container;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Factories\Sequence;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 use PHPUnit\Framework\TestCase;
@@ -242,6 +243,33 @@ public function test_sequences()
         }));
     }
 
+    public function test_model_has_factory()
+    {
+        Factory::guessFactoryNamesUsing(function ($model) {
+            return $model.'Factory';
+        });
+
+        $this->assertInstanceOf(FactoryTestUserFactory::class, FactoryTestUser::factory());
+    }
+
+    public function test_call()
+    {
+        Factory::guessFactoryNamesUsing(function ($model) {
+            return $model.'Factory';
+        });
+
+        $user = FactoryTestUserFactory::new()->hasPosts(3)->create();
+        $this->assertCount(3, $user->posts);
+
+        $post = FactoryTestPostFactory::new()
+                            ->forAuthor(['name' => 'Taylor Otwell'])
+                            ->hasComments(2)
+                            ->create();
+        $this->assertInstanceOf(FactoryTestUser::class, $post->author);
+        $this->assertEquals('Taylor Otwell', $post->author->name);
+        $this->assertCount(2, $post->comments);
+    }
+
     /**
      * Get a database connection instance.
      *
@@ -277,6 +305,8 @@ public function definition()
 
 class FactoryTestUser extends Eloquent
 {
+    use HasFactory;
+
     protected $table = 'users';
 
     public function posts()
@@ -312,6 +342,11 @@ public function user()
         return $this->belongsTo(FactoryTestUser::class, 'user_id');
     }
 
+    public function author()
+    {
+        return $this->belongsTo(FactoryTestUser::class, 'user_id');
+    }
+
     public function comments()
     {
         return $this->morphMany(FactoryTestComment::class, 'commentable');