maksimru / eloquent-subquery-magic

src/SubqueryMagic/Scopes/SubqueryMagicScope.php

Doc Comments +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     /**
      * Apply the scope to a given Eloquent query builder.
      *
-     * @param \Illuminate\Database\Eloquent\Builder|Relation $builder
+     * @param Builder $builder
      * @param \Illuminate\Database\Eloquent\Model            $model
      *
      * @return void
@@ -41,7 +41,7 @@ 
     /**
      * Extend the query builder with the needed functions.
      *
-     * @param \Illuminate\Database\Eloquent\Builder|Relation $builder
+     * @param Builder $builder
      *
      * @return void
      */

Spacing +8 added lines, -8 removed lines

@@ -76,7 +76,7 @@ 
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
              */
-            $builder->leftJoin(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)), $on);
+            $builder->leftJoin(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)), $on);
             //merge bindings from subquery
             $this->addBindings($builder, $subquery->getBindings(), 'join');
 
@@ -98,7 +98,7 @@ 
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
              */
-            $builder->rightJoin(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)), $on);
+            $builder->rightJoin(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)), $on);
             //merge bindings from subquery
             $this->addBindings($builder, $subquery->getBindings(), 'join');
 
@@ -120,7 +120,7 @@ 
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
              */
-            $builder->join(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)), $on);
+            $builder->join(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)), $on);
             //merge bindings from subquery
             $this->addBindings($builder, $subquery->getBindings(), 'join');
 
@@ -142,7 +142,7 @@ 
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
              */
-            $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field).' IN ('.$subquery->toSql().')');
+            $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' IN (' . $subquery->toSql() . ')');
             //merge bindings from subquery
             $this->addBindings($builder, $subquery->getBindings(), 'where');
 
@@ -164,7 +164,7 @@ 
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
              */
-            $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field).' NOT IN ('.$subquery->toSql().')');
+            $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' NOT IN (' . $subquery->toSql() . ')');
             //merge bindings from subquery
             $this->addBindings($builder, $subquery->getBindings(), 'where');
 
@@ -186,7 +186,7 @@ 
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
              */
-            $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field).' IN ('.$subquery->toSql().')');
+            $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' IN (' . $subquery->toSql() . ')');
             //merge bindings from subquery
             $this->addBindings($builder, $subquery->getBindings(), 'where');
 
@@ -208,7 +208,7 @@ 
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
              */
-            $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field).' NOT IN ('.$subquery->toSql().')');
+            $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' NOT IN (' . $subquery->toSql() . ')');
             //merge bindings from subquery
             $this->addBindings($builder, $subquery->getBindings(), 'where');
 
@@ -230,7 +230,7 @@ 
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
              */
-            $builder->from(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)));
+            $builder->from(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)));
             //merge bindings from subquery
             $builder->setBindings(array_merge($subquery->getBindings(), $builder->getBindings()));