minor code formatting improvements (#56296)

utilize short closures and new line chaining to improve readability and prep for better diffs. no behavior change, purely formatting.

Author: browner12

src/Illuminate/Bus/Queueable.php

@@ -204,11 +204,9 @@ public function through($middleware)
  */
  public function chain($chain)
  {
- $jobs = ChainedBatch::prepareNestedBatches(new Collection($chain));
-
- $this->chained = $jobs->map(function ($job) {
- return $this->serializeJob($job);
- })->all();
+ $this->chained = ChainedBatch::prepareNestedBatches(new Collection($chain))
+ ->map(fn ($job) => $this->serializeJob($job))
+ ->all();
 
  return $this;
  }

src/Illuminate/Collections/LazyCollection.php

@@ -1766,9 +1766,9 @@ public function zip($items)
  $iterables = func_get_args();
 
  return new static(function () use ($iterables) {
- $iterators = (new Collection($iterables))->map(function ($iterable) {
- return $this->makeIterator($iterable);
- })->prepend($this->getIterator());
+ $iterators = (new Collection($iterables))
+ ->map(fn ($iterable) => $this->makeIterator($iterable))
+  ->prepend($this->getIterator());
 
  while ($iterators->contains->valid()) {
  yield new static($iterators->map->current());

src/Illuminate/Console/Scheduling/ScheduleFinishCommand.php

@@ -40,12 +40,12 @@ class ScheduleFinishCommand extends Command
  */
  public function handle(Schedule $schedule)
  {
- (new Collection($schedule->events()))->filter(function ($value) {
- return $value->mutexName() == $this->argument('id');
- })->each(function ($event) {
- $event->finish($this->laravel, $this->argument('code'));
+ (new Collection($schedule->events()))
+ ->filter(fn ($value) => $value->mutexName() == $this->argument('id'))
+  ->each(function ($event) {
+  $event->finish($this->laravel, $this->argument('code'));
 
- $this->laravel->make(Dispatcher::class)->dispatch(new ScheduledBackgroundTaskFinished($event));
- });
+  $this->laravel->make(Dispatcher::class)->dispatch(new ScheduledBackgroundTaskFinished($event));
+  });
  }
 }

src/Illuminate/Database/Eloquent/Casts/AsEnumArrayObject.php

@@ -68,9 +68,9 @@ public function set($model, $key, $value, $attributes)
 
  public function serialize($model, string $key, $value, array $attributes)
  {
- return (new Collection($value->getArrayCopy()))->map(function ($enum) {
- return $this->getStorableEnumValue($enum);
- })->toArray();
+ return (new Collection($value->getArrayCopy()))
+ ->map(fn ($enum) => $this->getStorableEnumValue($enum))
+  ->toArray();
  }
 
  protected function getStorableEnumValue($enum)

src/Illuminate/Database/Eloquent/Casts/AsEnumCollection.php

@@ -64,9 +64,9 @@ public function set($model, $key, $value, $attributes)
 
  public function serialize($model, string $key, $value, array $attributes)
  {
- return (new Collection($value))->map(function ($enum) {
- return $this->getStorableEnumValue($enum);
- })->toArray();
+ return (new Collection($value))
+ ->map(fn ($enum) => $this->getStorableEnumValue($enum))
+  ->toArray();
  }
 
  protected function getStorableEnumValue($enum)

src/Illuminate/Database/Query/Grammars/Grammar.php

@@ -1195,9 +1195,9 @@ public function compileInsert(Builder $query, array $values)
  // We need to build a list of parameter place-holders of values that are bound
  // to the query. Each insert should have the exact same number of parameter
  // bindings so we will loop through the record and parameterize them all.
- $parameters = (new Collection($values))->map(function ($record) {
- return '('.$this->parameterize($record).')';
- })->implode(', ');
+ $parameters = (new Collection($values))
+ ->map(fn ($record) => '('.$this->parameterize($record).')')
+  ->implode(', ');
 
  return "insert into $table ($columns) values $parameters";
  }
@@ -1294,9 +1294,9 @@ public function compileUpdate(Builder $query, array $values)
  */
  protected function compileUpdateColumns(Builder $query, array $values)
  {
- return (new Collection($values))->map(function ($value, $key) {
- return $this->wrap($key).' = '.$this->parameter($value);
- })->implode(', ');
+ return (new Collection($values))
+ ->map(fn ($value, $key) => $this->wrap($key).' = '.$this->parameter($value))
+  ->implode(', ');
  }
 
  /**

src/Illuminate/Database/Query/Grammars/PostgresGrammar.php

@@ -167,9 +167,9 @@ public function whereFullText(Builder $query, $where)
  $language = 'english';
  }
 
- $columns = (new Collection($where['columns']))->map(function ($column) use ($language) {
- return "to_tsvector('{$language}', {$this->wrap($column)})";
- })->implode(' || ');
+ $columns = (new Collection($where['columns']))
+ ->map(fn ($column) => "to_tsvector('{$language}', {$this->wrap($column)})")
+  ->implode(' || ');
 
  $mode = 'plainto_tsquery';
 

src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php

@@ -289,15 +289,17 @@ protected function compileUpdateColumns(Builder $query, array $values)
  {
  $jsonGroups = $this->groupJsonColumnsForUpdate($values);
 
- return (new Collection($values))->reject(function ($value, $key) {
- return $this->isJsonSelector($key);
- })->merge($jsonGroups)->map(function ($value, $key) use ($jsonGroups) {
- $column = last(explode('.', $key));
+ return (new Collection($values))
+ ->reject(fn ($value, $key) => $this->isJsonSelector($key))
+ ->merge($jsonGroups)
+ ->map(function ($value, $key) use ($jsonGroups) {
+ $column = last(explode('.', $key));
 
- $value = isset($jsonGroups[$key]) ? $this->compileJsonPatch($column, $value) : $this->parameter($value);
+  $value = isset($jsonGroups[$key]) ? $this->compileJsonPatch($column, $value) : $this->parameter($value);
 
- return $this->wrap($column).' = '.$value;
- })->implode(', ');
+ return $this->wrap($column).' = '.$value;
+ })
+ ->implode(', ');
  }
 
  /**

src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php

@@ -419,15 +419,15 @@ public function compileUpsert(Builder $query, array $values, array $uniqueBy, ar
 
  $sql = 'merge '.$this->wrapTable($query->from).' ';
 
- $parameters = (new Collection($values))->map(function ($record) {
- return '('.$this->parameterize($record).')';
- })->implode(', ');
+ $parameters = (new Collection($values))
+ ->map(fn ($record) => '('.$this->parameterize($record).')')
+  ->implode(', ');
 
  $sql .= 'using (values '.$parameters.') '.$this->wrapTable('laravel_source').' ('.$columns.') ';
 
- $on = (new Collection($uniqueBy))->map(function ($column) use ($query) {
- return $this->wrap('laravel_source.'.$column).' = '.$this->wrap($query->from.'.'.$column);
- })->implode(' and ');
+ $on = (new Collection($uniqueBy))
+ ->map(fn ($column) => $this->wrap('laravel_source.'.$column).' = '.$this->wrap($query->from.'.'.$column))
+  ->implode(' and ');
 
  $sql .= 'on '.$on.' ';
 

src/Illuminate/Database/Schema/Blueprint.php

@@ -179,9 +179,8 @@ protected function ensureCommandsAreValid()
  */
  protected function commandsNamed(array $names)
  {
- return (new Collection($this->commands))->filter(function ($command) use ($names) {
- return in_array($command->name, $names);
- });
+ return (new Collection($this->commands))
+ ->filter(fn ($command) => in_array($command->name, $names));
  }
 
  /**
@@ -316,9 +315,8 @@ public function addAlterCommands()
  */
  public function creating()
  {
- return (new Collection($this->commands))->contains(function ($command) {
- return ! $command instanceof ColumnDefinition && $command->name === 'create';
- });
+ return (new Collection($this->commands))
+ ->contains(fn ($command) => ! $command instanceof ColumnDefinition && $command->name === 'create');
  }
 
  /**