From 3fcb112681ab99092624696f5b8f399c2b92ad5d Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 30 Apr 2025 09:52:57 +0100 Subject: [PATCH 1/2] Update BelongsToManyRelationship.php --- .../Eloquent/Factories/BelongsToManyRelationship.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Illuminate/Database/Eloquent/Factories/BelongsToManyRelationship.php b/src/Illuminate/Database/Eloquent/Factories/BelongsToManyRelationship.php index fd350e6fce6c..8ccc0bb10749 100644 --- a/src/Illuminate/Database/Eloquent/Factories/BelongsToManyRelationship.php +++ b/src/Illuminate/Database/Eloquent/Factories/BelongsToManyRelationship.php @@ -50,9 +50,13 @@ public function __construct($factory, $pivot, $relationship) */ public function createFor(Model $model) { - $relationship = $model->{$this->relationship}(); + $factoryInstance = $this->factory instanceof Factory; - Collection::wrap($this->factory instanceof Factory ? $this->factory->prependState($relationship->getQuery()->pendingAttributes)->create([], $model) : $this->factory)->each(function ($attachable) use ($model) { + if($factoryInstance) { + $relationship = $model->{$this->relationship}(); + } + + Collection::wrap($factoryInstance ? $this->factory->prependState($relationship->getQuery()->pendingAttributes)->create([], $model) : $this->factory)->each(function ($attachable) use ($model) { $model->{$this->relationship}()->attach( $attachable, is_callable($this->pivot) ? call_user_func($this->pivot, $model) : $this->pivot From 4509a14b5242771247cf5084f5d8a60736a0018e Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 30 Apr 2025 10:06:14 +0100 Subject: [PATCH 2/2] cs --- .../Database/Eloquent/Factories/BelongsToManyRelationship.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Eloquent/Factories/BelongsToManyRelationship.php b/src/Illuminate/Database/Eloquent/Factories/BelongsToManyRelationship.php index 8ccc0bb10749..5498dc856516 100644 --- a/src/Illuminate/Database/Eloquent/Factories/BelongsToManyRelationship.php +++ b/src/Illuminate/Database/Eloquent/Factories/BelongsToManyRelationship.php @@ -52,7 +52,7 @@ public function createFor(Model $model) { $factoryInstance = $this->factory instanceof Factory; - if($factoryInstance) { + if ($factoryInstance) { $relationship = $model->{$this->relationship}(); }