|
@@ -134,9 +134,9 @@ discard block |
|
|
block discarded – undo |
|
134
|
134
|
$query->join($throughParent->getTable(), $first, '=', $second); |
|
135
|
135
|
|
|
136
|
136
|
if ($this->throughParentInstanceSoftDeletes($throughParent)) { |
|
137
|
|
- $column= $throughParent->getQualifiedDeletedAtColumn(); |
|
|
137
|
+ $column = $throughParent->getQualifiedDeletedAtColumn(); |
|
138
|
138
|
|
|
139
|
|
- $query->withGlobalScope(__CLASS__ . ":$column", function (Builder $query) use ($column) { |
|
|
139
|
+ $query->withGlobalScope(__CLASS__.":$column", function(Builder $query) use ($column) { |
|
140
|
140
|
$query->whereNull($column); |
|
141
|
141
|
}); |
|
142
|
142
|
} |
|
@@ -202,7 +202,7 @@ discard block |
|
|
block discarded – undo |
|
202
|
202
|
|
|
203
|
203
|
$this->query->addSelect($columns); |
|
204
|
204
|
|
|
205
|
|
- return tap($this->query->paginate($perPage, $columns, $pageName, $page), function (Paginator $paginator) { |
|
|
205
|
+ return tap($this->query->paginate($perPage, $columns, $pageName, $page), function(Paginator $paginator) { |
|
206
|
206
|
$this->hydrateIntermediateRelations($paginator->items()); |
|
207
|
207
|
}); |
|
208
|
208
|
} |
|
@@ -224,7 +224,7 @@ discard block |
|
|
block discarded – undo |
|
224
|
224
|
|
|
225
|
225
|
$this->query->addSelect($columns); |
|
226
|
226
|
|
|
227
|
|
- return tap($this->query->simplePaginate($perPage, $columns, $pageName, $page), function (Paginator $paginator) { |
|
|
227
|
+ return tap($this->query->simplePaginate($perPage, $columns, $pageName, $page), function(Paginator $paginator) { |
|
228
|
228
|
$this->hydrateIntermediateRelations($paginator->items()); |
|
229
|
229
|
}); |
|
230
|
230
|
} |
|
@@ -246,7 +246,7 @@ discard block |
|
|
block discarded – undo |
|
246
|
246
|
|
|
247
|
247
|
$this->query->addSelect($columns); |
|
248
|
248
|
|
|
249
|
|
- return tap($this->query->cursorPaginate($perPage, $columns, $cursorName, $cursor), function (CursorPaginator $paginator) { |
|
|
249
|
+ return tap($this->query->cursorPaginate($perPage, $columns, $cursorName, $cursor), function(CursorPaginator $paginator) { |
|
250
|
250
|
$this->hydrateIntermediateRelations($paginator->items()); |
|
251
|
251
|
}); |
|
252
|
252
|
} |
|
@@ -271,7 +271,7 @@ discard block |
|
|
block discarded – undo |
|
271
|
271
|
*/ |
|
272
|
272
|
public function chunk($count, callable $callback) |
|
273
|
273
|
{ |
|
274
|
|
- return $this->prepareQueryBuilder()->chunk($count, function (Collection $results) use ($callback) { |
|
|
274
|
+ return $this->prepareQueryBuilder()->chunk($count, function(Collection $results) use ($callback) { |
|
275
|
275
|
$this->hydrateIntermediateRelations($results->all()); |
|
276
|
276
|
|
|
277
|
277
|
return $callback($results); |
|
@@ -341,7 +341,7 @@ discard block |
|
|
block discarded – undo |
|
341
|
341
|
} |
|
342
|
342
|
|
|
343
|
343
|
foreach ($columns as $column) { |
|
344
|
|
- $this->query->withoutGlobalScope(__CLASS__ . ":$column"); |
|
|
344
|
+ $this->query->withoutGlobalScope(__CLASS__.":$column"); |
|
345
|
345
|
} |
|
346
|
346
|
|
|
347
|
347
|
return $this; |