Fix CS

Author: GromNaN

src/Eloquent/Builder.php

@@ -326,12 +326,12 @@ public function withAggregate($relations, $column, $function = null)
             if ($relation instanceof EmbedsOneOrMany) {
                 switch ($function) {
                     case 'count':
-                        $this->project([$alias => ['$size' => ['$ifNull' => ['$' . $name, []]]]]);
+                        $this->getQuery()->project([$alias => ['$size' => ['$ifNull' => ['$' . $name, []]]]]);
                         break;
                     case 'min':
                     case 'max':
                     case 'avg':
-                        $this->project([$alias => ['$' . $function => '$' . $name . '.' . $column]]);
+                        $this->getQuery()->project([$alias => ['$' . $function => '$' . $name . '.' . $column]]);
                         break;
                     default:
                         throw new InvalidArgumentException(sprintf('Invalid aggregate function "%s"', $function));

tests/Eloquent/EloquentWithAggregateTest.php

@@ -5,7 +5,10 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
-use MongoDB\Laravel\Eloquent\Model;
+use MongoDB\Laravel\Tests\Eloquent\Models\EloquentWithAggregateModel1;
+use MongoDB\Laravel\Tests\Eloquent\Models\EloquentWithAggregateModel2;
+use MongoDB\Laravel\Tests\Eloquent\Models\EloquentWithAggregateModel3;
+use MongoDB\Laravel\Tests\Eloquent\Models\EloquentWithAggregateModel4;
 use MongoDB\Laravel\Tests\TestCase;
 
 use function count;
@@ -260,95 +263,3 @@ private static function assertSameResults(array $expected, Collection $collectio
         self::assertSame($expected, $actual);
     }
 }
-
-class EloquentWithAggregateModel1 extends Model
-{
-    protected $connection = 'mongodb';
-    public $table = 'one';
-    public $timestamps = false;
-    protected $guarded = [];
-
-    public function twos()
-    {
-        return $this->hasMany(EloquentWithAggregateModel2::class, 'one_id');
-    }
-
-    public function fours()
-    {
-        return $this->hasMany(EloquentWithAggregateModel4::class, 'one_id');
-    }
-
-    public function allFours()
-    {
-        return $this->fours()->withoutGlobalScopes();
-    }
-
-    public function embeddeds()
-    {
-        return $this->embedsMany(EloquentWithAggregateEmbeddedModel::class);
-    }
-}
-
-class EloquentWithAggregateModel2 extends Model
-{
-    protected $connection = 'mongodb';
-    public $table = 'two';
-    public $timestamps = false;
-    protected $guarded = [];
-    protected $withCount = ['threes'];
-
-    protected static function boot()
-    {
-        parent::boot();
-
-        static::addGlobalScope('app', function ($builder) {
-            $builder->latest();
-        });
-    }
-
-    public function threes()
-    {
-        return $this->hasMany(EloquentWithAggregateModel3::class, 'two_id');
-    }
-}
-
-class EloquentWithAggregateModel3 extends Model
-{
-    protected $connection = 'mongodb';
-    public $table = 'three';
-    public $timestamps = false;
-    protected $guarded = [];
-
-    protected static function boot()
-    {
-        parent::boot();
-
-        static::addGlobalScope('app', function ($builder) {
-            $builder->where('id', '>', 0);
-        });
-    }
-}
-
-class EloquentWithAggregateModel4 extends Model
-{
-    protected $connection = 'mongodb';
-    public $table = 'four';
-    public $timestamps = false;
-    protected $guarded = [];
-
-    protected static function boot()
-    {
-        parent::boot();
-
-        static::addGlobalScope('app', function ($builder) {
-            $builder->where('id', '>', 1);
-        });
-    }
-}
-
-class EloquentWithAggregateEmbeddedModel extends Model
-{
-    protected $connection = 'mongodb';
-    public $timestamps = false;
-    protected $guarded = [];
-}

tests/Eloquent/Models/EloquentWithAggregateEmbeddedModel.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace MongoDB\Laravel\Tests\Eloquent\Models;
+
+use MongoDB\Laravel\Eloquent\Model;
+
+class EloquentWithAggregateEmbeddedModel extends Model
+{
+    protected $connection = 'mongodb';
+    public $timestamps = false;
+    protected $guarded = [];
+}

tests/Eloquent/Models/EloquentWithAggregateModel1.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace MongoDB\Laravel\Tests\Eloquent\Models;
+
+use MongoDB\Laravel\Eloquent\Model;
+
+class EloquentWithAggregateModel1 extends Model
+{
+    protected $connection = 'mongodb';
+    public $table = 'one';
+    public $timestamps = false;
+    protected $guarded = [];
+
+    public function twos()
+    {
+        return $this->hasMany(EloquentWithAggregateModel2::class, 'one_id');
+    }
+
+    public function fours()
+    {
+        return $this->hasMany(EloquentWithAggregateModel4::class, 'one_id');
+    }
+
+    public function allFours()
+    {
+        return $this->fours()->withoutGlobalScopes();
+    }
+
+    public function embeddeds()
+    {
+        return $this->embedsMany(EloquentWithAggregateEmbeddedModel::class);
+    }
+}

tests/Eloquent/Models/EloquentWithAggregateModel2.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace MongoDB\Laravel\Tests\Eloquent\Models;
+
+use MongoDB\Laravel\Eloquent\Model;
+
+class EloquentWithAggregateModel2 extends Model
+{
+    protected $connection = 'mongodb';
+    public $table = 'two';
+    public $timestamps = false;
+    protected $guarded = [];
+    protected $withCount = ['threes'];
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::addGlobalScope('app', function ($builder) {
+            $builder->latest();
+        });
+    }
+
+    public function threes()
+    {
+        return $this->hasMany(EloquentWithAggregateModel3::class, 'two_id');
+    }
+}

tests/Eloquent/Models/EloquentWithAggregateModel3.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace MongoDB\Laravel\Tests\Eloquent\Models;
+
+use MongoDB\Laravel\Eloquent\Model;
+
+class EloquentWithAggregateModel3 extends Model
+{
+    protected $connection = 'mongodb';
+    public $table = 'three';
+    public $timestamps = false;
+    protected $guarded = [];
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::addGlobalScope('app', function ($builder) {
+            $builder->where('id', '>', 0);
+        });
+    }
+}

tests/Eloquent/Models/EloquentWithAggregateModel4.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace MongoDB\Laravel\Tests\Eloquent\Models;
+
+use MongoDB\Laravel\Eloquent\Model;
+
+class EloquentWithAggregateModel4 extends Model
+{
+    protected $connection = 'mongodb';
+    public $table = 'four';
+    public $timestamps = false;
+    protected $guarded = [];
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::addGlobalScope('app', function ($builder) {
+            $builder->where('id', '>', 1);
+        });
+    }
+}