From 4addaebdd814400e250299cd21a8ac7f00524bc4 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 31 Aug 2025 15:22:53 -0500 Subject: [PATCH] update multiline chaining formatting to better match `laravel/framework` formatting --- src/Engines/Algolia3Engine.php | 5 +- src/Engines/Algolia4Engine.php | 5 +- src/Engines/AlgoliaEngine.php | 65 +++++++++++------------ src/Engines/CollectionEngine.php | 33 +++++------- src/Engines/MeilisearchEngine.php | 87 ++++++++++++++++--------------- src/Engines/TypesenseEngine.php | 21 +++----- 6 files changed, 105 insertions(+), 111 deletions(-) diff --git a/src/Engines/Algolia3Engine.php b/src/Engines/Algolia3Engine.php index d489ef5d..3924e978 100644 --- a/src/Engines/Algolia3Engine.php +++ b/src/Engines/Algolia3Engine.php @@ -88,7 +88,10 @@ public function update($models) $model->scoutMetadata(), ['objectID' => $model->getScoutKey()], ); - })->filter()->values()->all(); + }) + ->filter() + ->values() + ->all(); if (! empty($objects)) { $index->saveObjects($objects); diff --git a/src/Engines/Algolia4Engine.php b/src/Engines/Algolia4Engine.php index 90a78cb6..1197f4dd 100644 --- a/src/Engines/Algolia4Engine.php +++ b/src/Engines/Algolia4Engine.php @@ -87,7 +87,10 @@ public function update($models) $model->scoutMetadata(), ['objectID' => $model->getScoutKey()], ); - })->filter()->values()->all(); + }) + ->filter() + ->values() + ->all(); if (! empty($objects)) { $this->algolia->saveObjects($index, $objects); diff --git a/src/Engines/AlgoliaEngine.php b/src/Engines/AlgoliaEngine.php index 1fbd89b8..b7e30524 100644 --- a/src/Engines/AlgoliaEngine.php +++ b/src/Engines/AlgoliaEngine.php @@ -129,18 +129,18 @@ public function paginate(Builder $builder, $perPage, $page) */ protected function filters(Builder $builder) { - $wheres = collect($builder->wheres)->map(function ($value, $key) { - return $key.'='.$value; - })->values(); + $wheres = collect($builder->wheres) + ->map(fn ($value, $key) => $key.'='.$value) + ->values(); return $wheres->merge(collect($builder->whereIns)->map(function ($values, $key) { if (empty($values)) { return '0=1'; } - return collect($values)->map(function ($value) use ($key) { - return $key.'='.$value; - })->all(); + return collect($values) + ->map(fn ($value) => $key.'='.$value) + ->all(); })->values())->values()->all(); } @@ -173,23 +173,21 @@ public function map(Builder $builder, $results, $model) $objectIdPositions = array_flip($objectIds); - return $model->getScoutModelsByIds( - $builder, $objectIds - )->filter(function ($model) use ($objectIds) { - return in_array($model->getScoutKey(), $objectIds); - })->map(function ($model) use ($results, $objectIdPositions) { - $result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? []; + return $model->getScoutModelsByIds($builder, $objectIds) + ->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds)) + ->map(function ($model) use ($results, $objectIdPositions) { + $result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? []; - foreach ($result as $key => $value) { - if (substr($key, 0, 1) === '_') { - $model->withScoutMetadata($key, $value); + foreach ($result as $key => $value) { + if (substr($key, 0, 1) === '_') { + $model->withScoutMetadata($key, $value); + } } - } - return $model; - })->sortBy(function ($model) use ($objectIdPositions) { - return $objectIdPositions[$model->getScoutKey()]; - })->values(); + return $model; + }) + ->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()]) + ->values(); } /** @@ -209,23 +207,22 @@ public function lazyMap(Builder $builder, $results, $model) $objectIds = collect($results['hits'])->pluck('objectID')->values()->all(); $objectIdPositions = array_flip($objectIds); - return $model->queryScoutModelsByIds( - $builder, $objectIds - )->cursor()->filter(function ($model) use ($objectIds) { - return in_array($model->getScoutKey(), $objectIds); - })->map(function ($model) use ($results, $objectIdPositions) { - $result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? []; + return $model->queryScoutModelsByIds($builder, $objectIds) + ->cursor() + ->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds)) + ->map(function ($model) use ($results, $objectIdPositions) { + $result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? []; - foreach ($result as $key => $value) { - if (substr($key, 0, 1) === '_') { - $model->withScoutMetadata($key, $value); + foreach ($result as $key => $value) { + if (substr($key, 0, 1) === '_') { + $model->withScoutMetadata($key, $value); + } } - } - return $model; - })->sortBy(function ($model) use ($objectIdPositions) { - return $objectIdPositions[$model->getScoutKey()]; - })->values(); + return $model; + }) + ->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()]) + ->values(); } /** diff --git a/src/Engines/CollectionEngine.php b/src/Engines/CollectionEngine.php index 7a7e6f08..312d95b5 100644 --- a/src/Engines/CollectionEngine.php +++ b/src/Engines/CollectionEngine.php @@ -199,19 +199,16 @@ public function map(Builder $builder, $results, $model) } $objectIds = collect($results) - ->pluck($model->getScoutKeyName()) - ->values() - ->all(); + ->pluck($model->getScoutKeyName()) + ->values() + ->all(); $objectIdPositions = array_flip($objectIds); - return $model->getScoutModelsByIds( - $builder, $objectIds - )->filter(function ($model) use ($objectIds) { - return in_array($model->getScoutKey(), $objectIds); - })->sortBy(function ($model) use ($objectIdPositions) { - return $objectIdPositions[$model->getScoutKey()]; - })->values(); + return $model->getScoutModelsByIds($builder, $objectIds) + ->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds)) + ->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()]) + ->values(); } /** @@ -231,18 +228,16 @@ public function lazyMap(Builder $builder, $results, $model) } $objectIds = collect($results) - ->pluck($model->getScoutKeyName()) - ->values()->all(); + ->pluck($model->getScoutKeyName()) + ->values()->all(); $objectIdPositions = array_flip($objectIds); - return $model->queryScoutModelsByIds( - $builder, $objectIds - )->cursor()->filter(function ($model) use ($objectIds) { - return in_array($model->getScoutKey(), $objectIds); - })->sortBy(function ($model) use ($objectIdPositions) { - return $objectIdPositions[$model->getScoutKey()]; - })->values(); + return $model->queryScoutModelsByIds($builder, $objectIds) + ->cursor() + ->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds)) + ->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()]) + ->values(); } /** diff --git a/src/Engines/MeilisearchEngine.php b/src/Engines/MeilisearchEngine.php index 7aa7702c..63a086ea 100644 --- a/src/Engines/MeilisearchEngine.php +++ b/src/Engines/MeilisearchEngine.php @@ -72,7 +72,10 @@ public function update($models) $model->scoutMetadata(), [$model->getScoutKeyName() => $model->getScoutKey()], ); - })->filter()->values()->all(); + }) + ->filter() + ->values() + ->all(); if (! empty($objects)) { $index->addDocuments($objects, $models->first()->getScoutKeyName()); @@ -176,19 +179,20 @@ protected function performSearch(Builder $builder, array $searchParams = []) */ protected function filters(Builder $builder) { - $filters = collect($builder->wheres)->map(function ($value, $key) { - if (is_bool($value)) { - return sprintf('%s=%s', $key, $value ? 'true' : 'false'); - } + $filters = collect($builder->wheres) + ->map(function ($value, $key) { + if (is_bool($value)) { + return sprintf('%s=%s', $key, $value ? 'true' : 'false'); + } - if (is_null($value)) { - return sprintf('%s %s', $key, 'IS NULL'); - } + if (is_null($value)) { + return sprintf('%s %s', $key, 'IS NULL'); + } - return is_numeric($value) - ? sprintf('%s=%s', $key, $value) - : sprintf('%s="%s"', $key, $value); - }); + return is_numeric($value) + ? sprintf('%s=%s', $key, $value) + : sprintf('%s="%s"', $key, $value); + }); $whereInOperators = [ 'whereIns' => 'IN', @@ -219,9 +223,9 @@ protected function filters(Builder $builder) */ protected function buildSortFromOrderByClauses(Builder $builder): array { - return collect($builder->orders)->map(function (array $order) { - return $order['column'].':'.$order['direction']; - })->toArray(); + return collect($builder->orders) + ->map(fn (array $order) => $order['column'].':'.$order['direction']) + ->toArray(); } /** @@ -288,23 +292,21 @@ public function map(Builder $builder, $results, $model) $objectIdPositions = array_flip($objectIds); - return $model->getScoutModelsByIds( - $builder, $objectIds - )->filter(function ($model) use ($objectIds) { - return in_array($model->getScoutKey(), $objectIds); - })->map(function ($model) use ($results, $objectIdPositions) { - $result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? []; + return $model->getScoutModelsByIds($builder, $objectIds) + ->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds)) + ->map(function ($model) use ($results, $objectIdPositions) { + $result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? []; - foreach ($result as $key => $value) { - if (substr($key, 0, 1) === '_') { - $model->withScoutMetadata($key, $value); + foreach ($result as $key => $value) { + if (substr($key, 0, 1) === '_') { + $model->withScoutMetadata($key, $value); + } } - } - return $model; - })->sortBy(function ($model) use ($objectIdPositions) { - return $objectIdPositions[$model->getScoutKey()]; - })->values(); + return $model; + }) + ->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()]) + ->values(); } /** @@ -323,23 +325,22 @@ public function lazyMap(Builder $builder, $results, $model) $objectIds = collect($results['hits'])->pluck($model->getScoutKeyName())->values()->all(); $objectIdPositions = array_flip($objectIds); - return $model->queryScoutModelsByIds( - $builder, $objectIds - )->cursor()->filter(function ($model) use ($objectIds) { - return in_array($model->getScoutKey(), $objectIds); - })->map(function ($model) use ($results, $objectIdPositions) { - $result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? []; + return $model->queryScoutModelsByIds($builder, $objectIds) + ->cursor() + ->filter(fn ($model) => in_array($model->getScoutKey(), $objectIds)) + ->map(function ($model) use ($results, $objectIdPositions) { + $result = $results['hits'][$objectIdPositions[$model->getScoutKey()]] ?? []; - foreach ($result as $key => $value) { - if (substr($key, 0, 1) === '_') { - $model->withScoutMetadata($key, $value); + foreach ($result as $key => $value) { + if (substr($key, 0, 1) === '_') { + $model->withScoutMetadata($key, $value); + } } - } - return $model; - })->sortBy(function ($model) use ($objectIdPositions) { - return $objectIdPositions[$model->getScoutKey()]; - })->values(); + return $model; + }) + ->sortBy(fn ($model) => $objectIdPositions[$model->getScoutKey()]) + ->values(); } /** diff --git a/src/Engines/TypesenseEngine.php b/src/Engines/TypesenseEngine.php index d8e3a6ff..cb8684dc 100644 --- a/src/Engines/TypesenseEngine.php +++ b/src/Engines/TypesenseEngine.php @@ -89,7 +89,10 @@ public function update($models) $searchableData, $model->scoutMetadata(), ); - })->filter()->values()->all(); + }) + ->filter() + ->values() + ->all(); if (! empty($objects)) { $this->importDocuments( @@ -516,12 +519,8 @@ public function map(Builder $builder, $results, $model) $objectIdPositions = array_flip($objectIds); return $model->getScoutModelsByIds($builder, $objectIds) - ->filter(static function ($model) use ($objectIds) { - return in_array($model->getScoutKey(), $objectIds, false); - }) - ->sortBy(static function ($model) use ($objectIdPositions) { - return $objectIdPositions[$model->getScoutKey()]; - }) + ->filter(static fn ($model) => in_array($model->getScoutKey(), $objectIds, false)) + ->sortBy(static fn ($model) => $objectIdPositions[$model->getScoutKey()]) ->values(); } @@ -548,12 +547,8 @@ public function lazyMap(Builder $builder, $results, $model) return $model->queryScoutModelsByIds($builder, $objectIds) ->cursor() - ->filter(static function ($model) use ($objectIds) { - return in_array($model->getScoutKey(), $objectIds, false); - }) - ->sortBy(static function ($model) use ($objectIdPositions) { - return $objectIdPositions[$model->getScoutKey()]; - }) + ->filter(static fn ($model) => in_array($model->getScoutKey(), $objectIds, false)) + ->sortBy(static fn ($model) => $objectIdPositions[$model->getScoutKey()]) ->values(); }