@@ -61,7 +61,7 @@ |
||
61 | 61 | { |
62 | 62 | $pathSeparator = $this->related->getPathSeparator(); |
63 | 63 | |
64 | - return $results->mapToDictionary(function (Model $result) use ($pathSeparator) { |
|
64 | + return $results->mapToDictionary(function(Model $result) use ($pathSeparator) { |
|
65 | 65 | $key = strtok($result->laravel_through_key, $pathSeparator); |
66 | 66 | |
67 | 67 | return [$key => $result]; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $keys = $this->getKeys($models, $this->localKey); |
69 | 69 | |
70 | 70 | $this->query->where( |
71 | - function (Builder $query) use ($keys) { |
|
71 | + function(Builder $query) use ($keys) { |
|
72 | 72 | $query->whereIn($this->foreignKey, $keys); |
73 | 73 | |
74 | 74 | if (in_array(null, $keys, true)) { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $value = $this->related->newCollection($dictionary[$key]); |
98 | 98 | |
99 | 99 | if (!$this->andSelf) { |
100 | - $value = $value->reject(function (Model $result) use ($model) { |
|
100 | + $value = $value->reject(function(Model $result) use ($model) { |
|
101 | 101 | return $result->{$result->getLocalKeyName()} == $model->{$model->getLocalKeyName()}; |
102 | 102 | })->values(); |
103 | 103 | } |
@@ -137,9 +137,9 @@ discard block |
||
137 | 137 | $second = $parentQuery->qualifyColumn($this->localKey); |
138 | 138 | |
139 | 139 | $query->select($columns) |
140 | - ->where(function (Builder $query) use ($first, $second) { |
|
140 | + ->where(function(Builder $query) use ($first, $second) { |
|
141 | 141 | $query->whereColumn($first, '=', $second) |
142 | - ->orWhere(function (Builder $query) use ($first, $second) { |
|
142 | + ->orWhere(function(Builder $query) use ($first, $second) { |
|
143 | 143 | $query->whereNull($first)->whereNull($second); |
144 | 144 | }); |
145 | 145 | }); |
@@ -175,9 +175,9 @@ discard block |
||
175 | 175 | $second = $this->getQualifiedParentKeyName(); |
176 | 176 | |
177 | 177 | $query->select($columns) |
178 | - ->where(function (Builder $query) use ($first, $second) { |
|
178 | + ->where(function(Builder $query) use ($first, $second) { |
|
179 | 179 | $query->whereColumn($first, '=', $second) |
180 | - ->orWhere(function (Builder $query) use ($first, $second) { |
|
180 | + ->orWhere(function(Builder $query) use ($first, $second) { |
|
181 | 181 | $query->whereNull($first)->whereNull($second); |
182 | 182 | }); |
183 | 183 | }); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | */ |
19 | 19 | public function compileInitialPath($column, $alias) |
20 | 20 | { |
21 | - return 'cast(' . $this->wrap($column) . ' as text) as ' . $this->wrap($alias); |
|
21 | + return 'cast('.$this->wrap($column).' as text) as '.$this->wrap($alias); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | public function selectPathList(Builder $query, $expression, $column, $pathSeparator, $listSeparator) |
62 | 62 | { |
63 | 63 | return $query->selectRaw( |
64 | - 'group_concat(' . $this->wrap($column) . ', ?)', |
|
64 | + 'group_concat('.$this->wrap($column).', ?)', |
|
65 | 65 | [$listSeparator] |
66 | 66 | )->from($expression); |
67 | 67 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function compileCycleDetectionInitialSelect(string $column): string |
115 | 115 | { |
116 | - return 'false as ' . $this->wrap($column); |
|
116 | + return 'false as '.$this->wrap($column); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | */ |
137 | 137 | public function compileCycleDetectionStopConstraint(string $column): string |
138 | 138 | { |
139 | - return 'not ' . $this->wrap($column); |
|
139 | + return 'not '.$this->wrap($column); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | /** |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | |
129 | 129 | $query = $this->newModelQuery() |
130 | 130 | ->select("$table.*") |
131 | - ->selectRaw($initialDepth . ' as ' . $depth) |
|
131 | + ->selectRaw($initialDepth.' as '.$depth) |
|
132 | 132 | ->selectRaw($initialPath) |
133 | 133 | ->from($from); |
134 | 134 | |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | $doctrineColumn->getScale() |
210 | 210 | ); |
211 | 211 | |
212 | - $query->selectRaw("$null as " . $grammar->wrap("pivot_$column")); |
|
212 | + $query->selectRaw("$null as ".$grammar->wrap("pivot_$column")); |
|
213 | 213 | } |
214 | 214 | } else { |
215 | 215 | foreach ($columns as $column) { |
@@ -288,16 +288,16 @@ discard block |
||
288 | 288 | |
289 | 289 | $joinColumns = [ |
290 | 290 | 'asc' => [ |
291 | - $name . '.' . $this->getLocalKeyName(), |
|
291 | + $name.'.'.$this->getLocalKeyName(), |
|
292 | 292 | $this->getQualifiedChildKeyName(), |
293 | 293 | ], |
294 | 294 | 'desc' => [ |
295 | - $name . '.' . $this->getLocalKeyName(), |
|
295 | + $name.'.'.$this->getLocalKeyName(), |
|
296 | 296 | $this->getQualifiedParentKeyName(), |
297 | 297 | ], |
298 | 298 | ]; |
299 | 299 | |
300 | - $recursiveDepth = $depth . ' ' . ($direction === 'asc' ? '-' : '+') . ' 1'; |
|
300 | + $recursiveDepth = $depth.' '.($direction === 'asc' ? '-' : '+').' 1'; |
|
301 | 301 | |
302 | 302 | $recursivePath = $grammar->compileRecursivePath( |
303 | 303 | $this->getQualifiedLocalKeyName(), |
@@ -307,8 +307,8 @@ discard block |
||
307 | 307 | $recursivePathBindings = $grammar->getRecursivePathBindings($this->getPathSeparator()); |
308 | 308 | |
309 | 309 | $query = $this->newModelQuery() |
310 | - ->select($table . '.*') |
|
311 | - ->selectRaw($recursiveDepth . ' as ' . $depth) |
|
310 | + ->select($table.'.*') |
|
311 | + ->selectRaw($recursiveDepth.' as '.$depth) |
|
312 | 312 | ->selectRaw($recursivePath, $recursivePathBindings) |
313 | 313 | ->from($from); |
314 | 314 |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | public function addConstraints() |
27 | 27 | { |
28 | 28 | if (static::$constraints) { |
29 | - $constraint = function (Builder $query) { |
|
29 | + $constraint = function(Builder $query) { |
|
30 | 30 | if ($this->andSelf) { |
31 | 31 | $query->where($this->getQualifiedLocalKeyName(), '=', $this->getParentKey()); |
32 | 32 | } else { |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | $keys = $this->getKeys($models, $this->localKey); |
55 | 55 | |
56 | - $constraint = function (Builder $query) use ($whereIn, $column, $keys) { |
|
56 | + $constraint = function(Builder $query) use ($whereIn, $column, $keys) { |
|
57 | 57 | $query->$whereIn($column, $keys); |
58 | 58 | }; |
59 | 59 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | $foreignKey = $this->getForeignKeyName(); |
103 | 103 | |
104 | - return $results->mapToDictionary(function (Model $result) use ($dictionary, $foreignKey) { |
|
104 | + return $results->mapToDictionary(function(Model $result) use ($dictionary, $foreignKey) { |
|
105 | 105 | if ($result->hasNestedPath()) { |
106 | 106 | $key = $dictionary[$result->getFirstPathSegment()]->{$foreignKey}; |
107 | 107 | } else { |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | ? $query->getQuery()->from.'.'.$this->localKey |
131 | 131 | : $this->foreignKey; |
132 | 132 | |
133 | - $constraint = function (Builder $query) use ($first) { |
|
133 | + $constraint = function(Builder $query) use ($first) { |
|
134 | 134 | $query->whereColumn( |
135 | 135 | $first, |
136 | 136 | '=', |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | ? $table.'.'.$this->localKey |
166 | 166 | : $table.'.'.$this->getForeignKeyName(); |
167 | 167 | |
168 | - $constraint = function (Builder $query) use ($first) { |
|
168 | + $constraint = function(Builder $query) use ($first) { |
|
169 | 169 | $query->whereColumn( |
170 | 170 | $first, |
171 | 171 | '=', |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | |
58 | 58 | $keys = $this->getKeys($models, $this->parentKey); |
59 | 59 | |
60 | - $constraint = function (Builder $query) use ($whereIn, $column, $keys) { |
|
60 | + $constraint = function(Builder $query) use ($whereIn, $column, $keys) { |
|
61 | 61 | $query->$whereIn($column, $keys); |
62 | 62 | }; |
63 | 63 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | */ |
81 | 81 | protected function buildDictionary(Collection $results) |
82 | 82 | { |
83 | - return $results->mapToDictionary(function (Model $result) { |
|
83 | + return $results->mapToDictionary(function(Model $result) { |
|
84 | 84 | return [$result->getFirstPathSegment() => $result]; |
85 | 85 | })->all(); |
86 | 86 | } |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | */ |
19 | 19 | public function compileInitialPath($column, $alias) |
20 | 20 | { |
21 | - return 'cast(' . $this->wrap($column) . ' as char(65535)) as ' . $this->wrap($alias); |
|
21 | + return 'cast('.$this->wrap($column).' as char(65535)) as '.$this->wrap($alias); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | public function selectPathList(Builder $query, $expression, $column, $pathSeparator, $listSeparator) |
62 | 62 | { |
63 | 63 | return $query->selectRaw( |
64 | - 'group_concat(' . $this->wrap($column) . " separator '$listSeparator')" |
|
64 | + 'group_concat('.$this->wrap($column)." separator '$listSeparator')" |
|
65 | 65 | )->from($expression); |
66 | 66 | } |
67 | 67 | |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | */ |
149 | 149 | public function compileCycleDetectionInitialSelect(string $column): string |
150 | 150 | { |
151 | - return 'false as ' . $this->wrap($column); |
|
151 | + return 'false as '.$this->wrap($column); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | /** |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | public function compileCycleDetectionStopConstraint(string $column): string |
173 | 173 | { |
174 | - return 'not ' . $this->wrap($column); |
|
174 | + return 'not '.$this->wrap($column); |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
@@ -18,6 +18,6 @@ |
||
18 | 18 | */ |
19 | 19 | public function compileInitialPath($column, $alias) |
20 | 20 | { |
21 | - return 'cast(' . $this->wrap($column) . ' as char(8192)) as ' . $this->wrap($alias); |
|
21 | + return 'cast('.$this->wrap($column).' as char(8192)) as '.$this->wrap($alias); |
|
22 | 22 | } |
23 | 23 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | public function addConstraints() |
35 | 35 | { |
36 | 36 | if (static::$constraints) { |
37 | - $constraint = function (Builder $query) { |
|
37 | + $constraint = function(Builder $query) { |
|
38 | 38 | $this->addExpressionWhereConstraints($query); |
39 | 39 | }; |
40 | 40 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function addEagerConstraints(array $models) |
60 | 60 | { |
61 | - $constraint = function (Builder $query) use ($models) { |
|
61 | + $constraint = function(Builder $query) use ($models) { |
|
62 | 62 | $this->addEagerExpressionWhereConstraints($query, $models); |
63 | 63 | }; |
64 | 64 | |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | |
246 | 246 | $query->withRecursiveExpression($name, $expression); |
247 | 247 | |
248 | - $query->withGlobalScope(get_class($this), function (Builder $query) use ($name) { |
|
248 | + $query->withGlobalScope(get_class($this), function(Builder $query) use ($name) { |
|
249 | 249 | $query->whereIn( |
250 | 250 | $this->getExpressionForeignKeyName(), |
251 | 251 | (new $this->parent())->setTable($name) |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | $alias = null; |
375 | 375 | } |
376 | 376 | |
377 | - $constraint = function (Builder $query) use ($table) { |
|
377 | + $constraint = function(Builder $query) use ($table) { |
|
378 | 378 | $this->addExistenceExpressionWhereConstraints($query, $table); |
379 | 379 | }; |
380 | 380 |