|
@@ -135,9 +135,9 @@ discard block |
|
|
block discarded – undo |
|
135
|
135
|
$query->join($throughParent->getTable(), $first, '=', $second); |
|
136
|
136
|
|
|
137
|
137
|
if ($this->throughParentInstanceSoftDeletes($throughParent)) { |
|
138
|
|
- $column= $throughParent->getQualifiedDeletedAtColumn(); |
|
|
138
|
+ $column = $throughParent->getQualifiedDeletedAtColumn(); |
|
139
|
139
|
|
|
140
|
|
- $query->withGlobalScope(__CLASS__ . ":$column", function (Builder $query) use ($column) { |
|
|
140
|
+ $query->withGlobalScope(__CLASS__.":$column", function(Builder $query) use ($column) { |
|
141
|
141
|
$query->whereNull($column); |
|
142
|
142
|
}); |
|
143
|
143
|
} |
|
@@ -203,7 +203,7 @@ discard block |
|
|
block discarded – undo |
|
203
|
203
|
|
|
204
|
204
|
$this->query->addSelect($columns); |
|
205
|
205
|
|
|
206
|
|
- return tap($this->query->paginate($perPage, $columns, $pageName, $page), function (Paginator $paginator) { |
|
|
206
|
+ return tap($this->query->paginate($perPage, $columns, $pageName, $page), function(Paginator $paginator) { |
|
207
|
207
|
$this->hydrateIntermediateRelations($paginator->items()); |
|
208
|
208
|
}); |
|
209
|
209
|
} |
|
@@ -225,7 +225,7 @@ discard block |
|
|
block discarded – undo |
|
225
|
225
|
|
|
226
|
226
|
$this->query->addSelect($columns); |
|
227
|
227
|
|
|
228
|
|
- return tap($this->query->simplePaginate($perPage, $columns, $pageName, $page), function (Paginator $paginator) { |
|
|
228
|
+ return tap($this->query->simplePaginate($perPage, $columns, $pageName, $page), function(Paginator $paginator) { |
|
229
|
229
|
$this->hydrateIntermediateRelations($paginator->items()); |
|
230
|
230
|
}); |
|
231
|
231
|
} |
|
@@ -247,7 +247,7 @@ discard block |
|
|
block discarded – undo |
|
247
|
247
|
|
|
248
|
248
|
$this->query->addSelect($columns); |
|
249
|
249
|
|
|
250
|
|
- return tap($this->query->cursorPaginate($perPage, $columns, $cursorName, $cursor), function (CursorPaginator $paginator) { |
|
|
250
|
+ return tap($this->query->cursorPaginate($perPage, $columns, $cursorName, $cursor), function(CursorPaginator $paginator) { |
|
251
|
251
|
$this->hydrateIntermediateRelations($paginator->items()); |
|
252
|
252
|
}); |
|
253
|
253
|
} |
|
@@ -272,7 +272,7 @@ discard block |
|
|
block discarded – undo |
|
272
|
272
|
*/ |
|
273
|
273
|
public function chunk($count, callable $callback) |
|
274
|
274
|
{ |
|
275
|
|
- return $this->prepareQueryBuilder()->chunk($count, function (Collection $results) use ($callback) { |
|
|
275
|
+ return $this->prepareQueryBuilder()->chunk($count, function(Collection $results) use ($callback) { |
|
276
|
276
|
$this->hydrateIntermediateRelations($results->all()); |
|
277
|
277
|
|
|
278
|
278
|
return $callback($results); |
|
@@ -303,7 +303,7 @@ discard block |
|
|
block discarded – undo |
|
303
|
303
|
); |
|
304
|
304
|
} |
|
305
|
305
|
|
|
306
|
|
- $table = $throughParent->getTable() . ' as ' . $this->getRelationCountHash(); |
|
|
306
|
+ $table = $throughParent->getTable().' as '.$this->getRelationCountHash(); |
|
307
|
307
|
|
|
308
|
308
|
$throughParent->setTable($table); |
|
309
|
309
|
|
|
@@ -366,7 +366,7 @@ discard block |
|
|
block discarded – undo |
|
366
|
366
|
} |
|
367
|
367
|
|
|
368
|
368
|
foreach ($columns as $column) { |
|
369
|
|
- $this->query->withoutGlobalScope(__CLASS__ . ":$column"); |
|
|
369
|
+ $this->query->withoutGlobalScope(__CLASS__.":$column"); |
|
370
|
370
|
} |
|
371
|
371
|
|
|
372
|
372
|
return $this; |