Skip to content

Commit c86bb43

Browse files
authored
improved readability for aliasedPivotColumns (#55055)
- use a new line for all chained Collection methods. easier to grok and much better diffs - use short closure for simple `map` call - utilize array unpacking to instantiate the Collection and avoid temporary variables
1 parent 472ea91 commit c86bb43

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -924,11 +924,14 @@ protected function shouldSelect(array $columns = ['*'])
924924
*/
925925
protected function aliasedPivotColumns()
926926
{
927-
$defaults = [$this->foreignPivotKey, $this->relatedPivotKey];
928-
929-
return (new BaseCollection(array_merge($defaults, $this->pivotColumns)))->map(function ($column) {
930-
return $this->qualifyPivotColumn($column).' as pivot_'.$column;
931-
})->unique()->all();
927+
return (new BaseCollection([
928+
$this->foreignPivotKey,
929+
$this->relatedPivotKey,
930+
...$this->pivotColumns,
931+
]))
932+
->map(fn ($column) => $this->qualifyPivotColumn($column).' as pivot_'.$column)
933+
->unique()
934+
->all();
932935
}
933936

934937
/**

src/Illuminate/Database/Eloquent/Relations/MorphToMany.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,15 @@ public function newPivot(array $attributes = [], $exists = false)
178178
*/
179179
protected function aliasedPivotColumns()
180180
{
181-
$defaults = [$this->foreignPivotKey, $this->relatedPivotKey, $this->morphType];
182-
183-
return (new Collection(array_merge($defaults, $this->pivotColumns)))->map(function ($column) {
184-
return $this->qualifyPivotColumn($column).' as pivot_'.$column;
185-
})->unique()->all();
181+
return (new Collection([
182+
$this->foreignPivotKey,
183+
$this->relatedPivotKey,
184+
$this->morphType,
185+
...$this->pivotColumns,
186+
]))
187+
->map(fn ($column) => $this->qualifyPivotColumn($column).' as pivot_'.$column)
188+
->unique()
189+
->all();
186190
}
187191

188192
/**

0 commit comments

Comments
 (0)