fix & cs

adjustments

Author: jackbayliss

src/Illuminate/Database/Eloquent/Concerns/HasEvents.php

@@ -208,6 +208,12 @@ protected function fireModelEvent($event, $halt = true)
             return true;
         }
 
+        // If we have automatic eager loading enabled for the creating event unset any null relations
+        // as it can cause issues and set the relations to null even if they exist.
+        if (static::isAutomaticallyEagerLoadingRelationships() && $event == 'creating') {
+            $this->setRelations(array_filter($this->getRelations()));
+        }
+
         // First, we will get the proper method to call on the event dispatcher, and then we
         // will attempt to fire a custom, object based event for the given event. If that
         // returns a result we can return that result, or we'll call the string events.

tests/Integration/Database/EloquentModelRelationAutoloadTest.php

@@ -3,6 +3,8 @@
 namespace Illuminate\Tests\Integration\Database\EloquentModelRelationAutoloadTest;
 
 use DB;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -12,6 +14,14 @@ class EloquentModelRelationAutoloadTest extends DatabaseTestCase
 {
     protected function afterRefreshingDatabase()
     {
+        Schema::create('tags', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name')->nullable();
+            $table->string('status')->nullable();
+            $table->unsignedInteger('post_id')->nullable();
+            $table->unsignedInteger('video_id')->nullable();
+        });
+
         Schema::create('posts', function (Blueprint $table) {
             $table->increments('id');
         });
@@ -214,6 +224,95 @@ public function testRelationAutoloadVariousNestedMorphRelations()
 
         DB::disableQueryLog();
     }
+
+    public function testDoesntCauseNQueryIssueUsingGet()
+    {
+        Model::automaticallyEagerLoadRelationships();
+
+        DB::enableQueryLog();
+
+        $post = Post::create();
+
+        $video = Video::create();
+        $video2 = Video::create();
+        $video3 = Video::create();
+
+        Tag::create(['post_id' => $post->id, 'video_id' => $video->id]);
+        Tag::create(['post_id' => $post->id, 'video_id' => $video2->id]);
+        Tag::create(['post_id' => $post->id, 'video_id' => $video3->id]);
+
+        $videos = [];
+        foreach ($post->tags()->get() as $tag) {
+            $videos[] = $tag->video;
+        }
+
+        $this->assertCount(12, DB::getQueryLog());
+        $this->assertCount(3, $videos);
+
+        Model::automaticallyEagerLoadRelationships(false);
+    }
+
+    public function testRelationAutoloadWorksOnCreatingEvent()
+    {
+        Model::automaticallyEagerLoadRelationships();
+
+        DB::enableQueryLog();
+
+        $tags = Tag::factory()->times(3)->make();
+
+        $post = Post::factory()->create();
+
+        $post->tags()->saveMany($tags);
+
+        $this->assertCount(7, DB::getQueryLog());
+
+        Model::automaticallyEagerLoadRelationships(false);
+
+        DB::disableQueryLog();
+    }
+}
+
+class TagFactory extends Factory
+{
+    protected $model = Tag::class;
+
+    public function definition()
+    {
+        return [];
+    }
+}
+
+class Tag extends Model
+{
+    use HasFactory;
+
+    public $timestamps = false;
+
+    protected $guarded = [];
+
+    protected static function booted()
+    {
+        static::creating(function ($model) {
+            if ($model->post->shouldApplyStatus()) {
+                $model->status = 'Todo';
+            }
+        });
+    }
+
+    protected static function newFactory()
+    {
+        return TagFactory::new();
+    }
+
+    public function post()
+    {
+        return $this->belongsTo(Post::class);
+    }
+
+    public function video()
+    {
+        return $this->belongsTo(Video::class);
+    }
 }
 
 class Comment extends Model
@@ -238,10 +337,26 @@ public function commentable()
     }
 }
 
+class PostFactory extends Factory
+{
+    protected $model = Post::class;
+
+    public function definition()
+    {
+        return [];
+    }
+}
 class Post extends Model
 {
+    use HasFactory;
+
     public $timestamps = false;
 
+    public function shouldApplyStatus()
+    {
+        return false;
+    }
+
     public function comments()
     {
         return $this->morphMany(Comment::class, 'commentable');
@@ -256,6 +371,16 @@ public function likes()
     {
         return $this->morphMany(Like::class, 'likeable');
     }
+
+    protected static function newFactory()
+    {
+        return PostFactory::new();
+    }
+
+    public function tags()
+    {
+        return $this->hasMany(Tag::class);
+    }
 }
 
 class Video extends Model