fix 'loadAggregate' unwanted event dispatch

laravel · Jun 7, 2024 · 99d8828 · 99d8828
1 parent ae0bc31
commit 99d8828
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
@@ -88,8 +88,8 @@ public function loadAggregate($relations, $column, $function = null)
         $models = $this->first()->newModelQuery()
             ->whereKey($this->modelKeys())
             ->select($this->first()->getKeyName())
-            ->withAggregate($relations, $column, $function)
-            ->get()
+            ->withAggregate($relations, $column, $function);
+        $models = Model::withoutEvents(fn () => $models->get())
             ->keyBy($this->first()->getKeyName());
 
         $attributes = Arr::except(

diff --git a/tests/Integration/Database/EloquentCollectionLoadCountTest.php b/tests/Integration/Database/EloquentCollectionLoadCountTest.php
@@ -66,6 +66,26 @@ public function testLoadCountWithSameModels()
         $this->assertSame('2', (string) $posts[2]->comments_count);
     }
 
+    public function testLoadCountDoesNotFireAnyModelRelatedEvents()
+    {
+        // arrange:
+        $posts = Post::all()->push(Post::first());
+
+        $_SERVER['-'] = [];
+
+        $listener = function($model) {
+            $_SERVER['-'][] = $model;
+        };
+
+        Post::getEventDispatcher()->listen('eloquent.*: '.Post::class, $listener);
+        // act:
+        $posts->loadCount('comments');
+
+        // assert:
+        $this->assertEquals([], $_SERVER['-']);
+        unset($_SERVER['-']);
+    }
+
     public function testLoadCountOnDeletedModels()
     {
         $posts = Post::all()->each->delete();

diff --git a/tests/Integration/Database/EloquentModelLoadMaxTest.php b/tests/Integration/Database/EloquentModelLoadMaxTest.php
@@ -48,6 +48,23 @@ public function testLoadMaxSingleRelation()
         $this->assertEquals(11, $model->related1_max_number);
     }
 
+    public function testLoadMaxDoesNotFireEvent()
+    {
+        $model = BaseModel::first();
+
+        $_SERVER['-'] = [];
+        $listener = function($model) {
+            $_SERVER['-'][] = $model;
+        };
+        BaseModel::getEventDispatcher()->listen('eloquent.*: '.BaseModel::class, $listener);
+        // act:
+        $model->loadMax('related1', 'number');
+
+        // assert:
+        $this->assertEquals([], $_SERVER['-']);
+        unset($_SERVER['-']);
+    }
+
     public function testLoadMaxMultipleRelations()
     {
         $model = BaseModel::first();

diff --git a/tests/Integration/Database/EloquentModelLoadMinTest.php b/tests/Integration/Database/EloquentModelLoadMinTest.php
@@ -48,6 +48,24 @@ public function testLoadMinSingleRelation()
         $this->assertEquals(10, $model->related1_min_number);
     }
 
+    public function testLoadMinDoesNotFireEvent()
+    {
+        $model = BaseModel::first();
+
+        $_SERVER['-'] = [];
+        $listener = function($model) {
+            $_SERVER['-'][] = $model;
+        };
+        BaseModel::getEventDispatcher()->listen('eloquent.*: '.BaseModel::class, $listener);
+
+        // act:
+        $model->loadMin('related1', 'number');
+
+        // assert:
+        $this->assertEquals([], $_SERVER['-']);
+        unset($_SERVER['-']);
+    }
+
     public function testLoadMinMultipleRelations()
     {
         $model = BaseModel::first();

diff --git a/tests/Integration/Database/EloquentModelLoadSumTest.php b/tests/Integration/Database/EloquentModelLoadSumTest.php
@@ -47,6 +47,24 @@ public function testLoadSumSingleRelation()
         $this->assertEquals(21, $model->related1_sum_number);
     }
 
+    public function testLoadSumDoesNotFireEvent()
+    {
+        $model = BaseModel::first();
+
+        $_SERVER['-'] = [];
+        $listener = function($model) {
+            $_SERVER['-'][] = $model;
+        };
+        BaseModel::getEventDispatcher()->listen('eloquent.*: '.BaseModel::class, $listener);
+
+        // act:
+        $model->loadSum('related1', 'number');
+
+        // assert:
+        $this->assertEquals([], $_SERVER['-']);
+        unset($_SERVER['-']);
+    }
+
     public function testLoadSumMultipleRelations()
     {
         $model = BaseModel::first();