maksimru / eloquent-subquery-magic

src/SubqueryMagic/Scopes/SubqueryMagicScope.php

Spacing +8 added lines, -8 removed lines

@@ -61,7 +61,7 @@ 
     protected function addLeftJoinSubquery(Builder $builder)
     {
         $builder->macro('leftJoinSubquery', function (Builder $builder, Builder $subquery, $alias, \Closure $on) {
-            $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());
 
@@ -84,7 +84,7 @@ 
     protected function addRightJoinSubquery(Builder $builder)
     {
         $builder->macro('rightJoinSubquery', function (Builder $builder, Builder $subquery, $alias, \Closure $on) {
-            $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());
 
@@ -102,7 +102,7 @@ 
     protected function addJoinSubquery(Builder $builder)
     {
         $builder->macro('joinSubquery', function (Builder $builder, Builder $subquery, $alias, \Closure $on) {
-            $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());
 
@@ -120,7 +120,7 @@ 
     protected function addWhereInSubquery(Builder $builder)
     {
         $builder->macro('whereInSubquery', function (Builder $builder, $field, Builder $subquery) {
-            $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());
 
@@ -138,7 +138,7 @@ 
     protected function addWhereNotInSubquery(Builder $builder)
     {
         $builder->macro('whereNotInSubquery', function (Builder $builder, $field, Builder $subquery) {
-            $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());
 
@@ -156,7 +156,7 @@ 
     protected function addOrWhereInSubquery(Builder $builder)
     {
         $builder->macro('orWhereInSubquery', function (Builder $builder, $field, Builder $subquery) {
-            $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());
 
@@ -174,7 +174,7 @@ 
     protected function addOrWhereNotInSubquery(Builder $builder)
     {
         $builder->macro('orWhereNotInSubquery', function (Builder $builder, $field, Builder $subquery) {
-            $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());
 
@@ -192,7 +192,7 @@ 
     protected function addFromSubquery(Builder $builder)
     {
         $builder->macro('fromSubquery', function (Builder $builder, Builder $subquery, $alias) {
-            $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()));