Fix passing model instances to factories (#35541)

laravel · Dec 8, 2020 · 2058279 · 2058279
1 parent 91b1279
commit 2058279
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Factories/Factory.php b/src/Illuminate/Database/Eloquent/Factories/Factory.php
@@ -492,7 +492,11 @@ public function hasAttached($factory, $pivot = [], $relationship = null)
             'has' => $this->has->concat([new BelongsToManyRelationship(
                 $factory,
                 $pivot,
-                $relationship ?: Str::camel(Str::plural(class_basename($factory->modelName())))
+                $relationship ?: Str::camel(Str::plural(class_basename(
+                    $factory instanceof Factory
+                        ? $factory->modelName()
+                        : Collection::wrap($factory)->first()
+                )))
             )]),
         ]);
     }
@@ -508,7 +512,9 @@ public function for($factory, $relationship = null)
     {
         return $this->newInstance(['for' => $this->for->concat([new BelongsToRelationship(
             $factory,
-            $relationship ?: Str::camel(class_basename($factory->modelName()))
+            $relationship ?: Str::camel(class_basename(
+                $factory instanceof Factory ? $factory->modelName() : $factory
+            ))
         )])]);
     }