Skip to content

Commit 2ebc098

Browse files
browner12browner12
authored
update multiline chaining formatting (#942)
to better match `laravel/framework` formatting
1 parent 91f7c36 commit 2ebc098

File tree

6 files changed

+105
-111
lines changed

6 files changed

+105
-111
lines changed

‎src/Engines/Algolia3Engine.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ public function update($models)
8888
$model->scoutMetadata(),
8989
['objectID' => $model->getScoutKey()],
9090
);
91-
})->filter()->values()->all();
91+
})
92+
->filter()
93+
->values()
94+
->all();
9295

9396
if (! empty($objects)) {
9497
$index->saveObjects($objects);

‎src/Engines/Algolia4Engine.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ public function update($models)
8787
$model->scoutMetadata(),
8888
['objectID' => $model->getScoutKey()],
8989
);
90-
})->filter()->values()->all();
90+
})
91+
->filter()
92+
->values()
93+
->all();
9194

9295
if (! empty($objects)) {
9396
$this->algolia->saveObjects($index, $objects);

‎src/Engines/AlgoliaEngine.php

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,18 @@ public function paginate(Builder $builder, $perPage, $page)
129129
*/
130130
protected function filters(Builder $builder)
131131
{
132-
$wheres = collect($builder->wheres)->map(function ($value, $key) {
133-
return $key.'='.$value;
134-
})->values();
132+
$wheres = collect($builder->wheres)
133+
->map(fn ($value, $key) => $key.'='.$value)
134+
->values();
135135

136136
return $wheres->merge(collect($builder->whereIns)->map(function ($values, $key) {
137137
if (empty($values)) {
138138
return '0=1';
139139
}
140140

141-
return collect($values)->map(function ($value) use ($key) {
142-
return $key.'='.$value;
143-
})->all();
141+
return collect($values)
142+
->map(fn ($value) => $key.'='.$value)
143+
->all();
144144
})->values())->values()->all();
145145
}
146146

@@ -173,23 +173,21 @@ public function map(Builder $builder, $results, $model)
173173

174174
$objectIdPositions = array_flip($objectIds);
175175

176-
return $model->getScoutModelsByIds(
177-
$builder, $objectIds
178-
)->filter(function ($model) use ($objectIds) {
179-
return in_array($model->getScoutKey(), $objectIds);
180-
})->map(function ($model) use ($results, $objectIdPositions) {
181-
$result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? [];
176+
return $model->getScoutModelsByIds($builder, $objectIds)
177+
->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds))
178+
->map(function ($model) use ($results, $objectIdPositions) {
179+
$result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? [];
182180

183-
foreach ($result as $key => $value) {
184-
if (substr($key, 0, 1) === '_') {
185-
$model->withScoutMetadata($key, $value);
181+
foreach ($result as $key => $value) {
182+
if (substr($key, 0, 1) === '_') {
183+
$model->withScoutMetadata($key, $value);
184+
}
186185
}
187-
}
188186

189-
return $model;
190-
})->sortBy(function ($model) use ($objectIdPositions) {
191-
return $objectIdPositions[$model->getScoutKey()];
192-
})->values();
187+
return $model;
188+
})
189+
->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()])
190+
->values();
193191
}
194192

195193
/**
@@ -209,23 +207,22 @@ public function lazyMap(Builder $builder, $results, $model)
209207
$objectIds = collect($results['hits'])->pluck('objectID')->values()->all();
210208
$objectIdPositions = array_flip($objectIds);
211209

212-
return $model->queryScoutModelsByIds(
213-
$builder, $objectIds
214-
)->cursor()->filter(function ($model) use ($objectIds) {
215-
return in_array($model->getScoutKey(), $objectIds);
216-
})->map(function ($model) use ($results, $objectIdPositions) {
217-
$result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? [];
210+
return $model->queryScoutModelsByIds($builder, $objectIds)
211+
->cursor()
212+
->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds))
213+
->map(function ($model) use ($results, $objectIdPositions) {
214+
$result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? [];
218215

219-
foreach ($result as $key => $value) {
220-
if (substr($key, 0, 1) === '_') {
221-
$model->withScoutMetadata($key, $value);
216+
foreach ($result as $key => $value) {
217+
if (substr($key, 0, 1) === '_') {
218+
$model->withScoutMetadata($key, $value);
219+
}
222220
}
223-
}
224221

225-
return $model;
226-
})->sortBy(function ($model) use ($objectIdPositions) {
227-
return $objectIdPositions[$model->getScoutKey()];
228-
})->values();
222+
return $model;
223+
})
224+
->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()])
225+
->values();
229226
}
230227

231228
/**

‎src/Engines/CollectionEngine.php

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -199,19 +199,16 @@ public function map(Builder $builder, $results, $model)
199199
}
200200

201201
$objectIds = collect($results)
202-
->pluck($model->getScoutKeyName())
203-
->values()
204-
->all();
202+
->pluck($model->getScoutKeyName())
203+
->values()
204+
->all();
205205

206206
$objectIdPositions = array_flip($objectIds);
207207

208-
return $model->getScoutModelsByIds(
209-
$builder, $objectIds
210-
)->filter(function ($model) use ($objectIds) {
211-
return in_array($model->getScoutKey(), $objectIds);
212-
})->sortBy(function ($model) use ($objectIdPositions) {
213-
return $objectIdPositions[$model->getScoutKey()];
214-
})->values();
208+
return $model->getScoutModelsByIds($builder, $objectIds)
209+
->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds))
210+
->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()])
211+
->values();
215212
}
216213

217214
/**
@@ -231,18 +228,16 @@ public function lazyMap(Builder $builder, $results, $model)
231228
}
232229

233230
$objectIds = collect($results)
234-
->pluck($model->getScoutKeyName())
235-
->values()->all();
231+
->pluck($model->getScoutKeyName())
232+
->values()->all();
236233

237234
$objectIdPositions = array_flip($objectIds);
238235

239-
return $model->queryScoutModelsByIds(
240-
$builder, $objectIds
241-
)->cursor()->filter(function ($model) use ($objectIds) {
242-
return in_array($model->getScoutKey(), $objectIds);
243-
})->sortBy(function ($model) use ($objectIdPositions) {
244-
return $objectIdPositions[$model->getScoutKey()];
245-
})->values();
236+
return $model->queryScoutModelsByIds($builder, $objectIds)
237+
->cursor()
238+
->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds))
239+
->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()])
240+
->values();
246241
}
247242

248243
/**

‎src/Engines/MeilisearchEngine.php

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ public function update($models)
7272
$model->scoutMetadata(),
7373
[$model->getScoutKeyName() => $model->getScoutKey()],
7474
);
75-
})->filter()->values()->all();
75+
})
76+
->filter()
77+
->values()
78+
->all();
7679

7780
if (! empty($objects)) {
7881
$index->addDocuments($objects, $models->first()->getScoutKeyName());
@@ -176,19 +179,20 @@ protected function performSearch(Builder $builder, array $searchParams = [])
176179
*/
177180
protected function filters(Builder $builder)
178181
{
179-
$filters = collect($builder->wheres)->map(function ($value, $key) {
180-
if (is_bool($value)) {
181-
return sprintf('%s=%s', $key, $value ? 'true' : 'false');
182-
}
182+
$filters = collect($builder->wheres)
183+
->map(function ($value, $key) {
184+
if (is_bool($value)) {
185+
return sprintf('%s=%s', $key, $value ? 'true' : 'false');
186+
}
183187

184-
if (is_null($value)) {
185-
return sprintf('%s %s', $key, 'IS NULL');
186-
}
188+
if (is_null($value)) {
189+
return sprintf('%s %s', $key, 'IS NULL');
190+
}
187191

188-
return is_numeric($value)
189-
? sprintf('%s=%s', $key, $value)
190-
: sprintf('%s="%s"', $key, $value);
191-
});
192+
return is_numeric($value)
193+
? sprintf('%s=%s', $key, $value)
194+
: sprintf('%s="%s"', $key, $value);
195+
});
192196

193197
$whereInOperators = [
194198
'whereIns' => 'IN',
@@ -219,9 +223,9 @@ protected function filters(Builder $builder)
219223
*/
220224
protected function buildSortFromOrderByClauses(Builder $builder): array
221225
{
222-
return collect($builder->orders)->map(function (array $order) {
223-
return $order['column'].':'.$order['direction'];
224-
})->toArray();
226+
return collect($builder->orders)
227+
->map(fn (array $order) => $order['column'].':'.$order['direction'])
228+
->toArray();
225229
}
226230

227231
/**
@@ -288,23 +292,21 @@ public function map(Builder $builder, $results, $model)
288292

289293
$objectIdPositions = array_flip($objectIds);
290294

291-
return $model->getScoutModelsByIds(
292-
$builder, $objectIds
293-
)->filter(function ($model) use ($objectIds) {
294-
return in_array($model->getScoutKey(), $objectIds);
295-
})->map(function ($model) use ($results, $objectIdPositions) {
296-
$result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? [];
295+
return $model->getScoutModelsByIds($builder, $objectIds)
296+
->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds))
297+
->map(function ($model) use ($results, $objectIdPositions) {
298+
$result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? [];
297299

298-
foreach ($result as $key => $value) {
299-
if (substr($key, 0, 1) === '_') {
300-
$model->withScoutMetadata($key, $value);
300+
foreach ($result as $key => $value) {
301+
if (substr($key, 0, 1) === '_') {
302+
$model->withScoutMetadata($key, $value);
303+
}
301304
}
302-
}
303305

304-
return $model;
305-
})->sortBy(function ($model) use ($objectIdPositions) {
306-
return $objectIdPositions[$model->getScoutKey()];
307-
})->values();
306+
return $model;
307+
})
308+
->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()])
309+
->values();
308310
}
309311

310312
/**
@@ -323,23 +325,22 @@ public function lazyMap(Builder $builder, $results, $model)
323325
$objectIds = collect($results['hits'])->pluck($model->getScoutKeyName())->values()->all();
324326
$objectIdPositions = array_flip($objectIds);
325327

326-
return $model->queryScoutModelsByIds(
327-
$builder, $objectIds
328-
)->cursor()->filter(function ($model) use ($objectIds) {
329-
return in_array($model->getScoutKey(), $objectIds);
330-
})->map(function ($model) use ($results, $objectIdPositions) {
331-
$result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? [];
328+
return $model->queryScoutModelsByIds($builder, $objectIds)
329+
->cursor()
330+
->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds))
331+
->map(function ($model) use ($results, $objectIdPositions) {
332+
$result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? [];
332333

333-
foreach ($result as $key => $value) {
334-
if (substr($key, 0, 1) === '_') {
335-
$model->withScoutMetadata($key, $value);
334+
foreach ($result as $key => $value) {
335+
if (substr($key, 0, 1) === '_') {
336+
$model->withScoutMetadata($key, $value);
337+
}
336338
}
337-
}
338339

339-
return $model;
340-
})->sortBy(function ($model) use ($objectIdPositions) {
341-
return $objectIdPositions[$model->getScoutKey()];
342-
})->values();
340+
return $model;
341+
})
342+
->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()])
343+
->values();
343344
}
344345

345346
/**

‎src/Engines/TypesenseEngine.php

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,10 @@ public function update($models)
8989
$searchableData,
9090
$model->scoutMetadata(),
9191
);
92-
})->filter()->values()->all();
92+
})
93+
->filter()
94+
->values()
95+
->all();
9396

9497
if (! empty($objects)) {
9598
$this->importDocuments(
@@ -516,12 +519,8 @@ public function map(Builder $builder, $results, $model)
516519
$objectIdPositions = array_flip($objectIds);
517520

518521
return $model->getScoutModelsByIds($builder, $objectIds)
519-
->filter(static function ($model) use ($objectIds) {
520-
return in_array($model->getScoutKey(), $objectIds, false);
521-
})
522-
->sortBy(static function ($model) use ($objectIdPositions) {
523-
return $objectIdPositions[$model->getScoutKey()];
524-
})
522+
->filter(static fn ($model) => in_array($model->getScoutKey(), $objectIds, false))
523+
->sortBy(static fn ($model) => $objectIdPositions[$model->getScoutKey()])
525524
->values();
526525
}
527526

@@ -548,12 +547,8 @@ public function lazyMap(Builder $builder, $results, $model)
548547

549548
return $model->queryScoutModelsByIds($builder, $objectIds)
550549
->cursor()
551-
->filter(static function ($model) use ($objectIds) {
552-
return in_array($model->getScoutKey(), $objectIds, false);
553-
})
554-
->sortBy(static function ($model) use ($objectIdPositions) {
555-
return $objectIdPositions[$model->getScoutKey()];
556-
})
550+
->filter(static fn ($model) => in_array($model->getScoutKey(), $objectIds, false))
551+
->sortBy(static fn ($model) => $objectIdPositions[$model->getScoutKey()])
557552
->values();
558553
}
559554

0 commit comments

Comments
 (0)