More simplifications

laravel · Dec 16, 2024 · aa0b887 · aa0b887
1 parent 0a88e50
commit aa0b887
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 28 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -927,9 +927,10 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
     {
         $this->query->addSelect($this->shouldSelect($columns));
 
-        return tap($this->query->paginate($perPage, $columns, $pageName, $page), function ($paginator) {
-            $this->hydratePivotRelation($paginator->items());
-        });
+        return tap(
+            $this->query->paginate($perPage, $columns, $pageName, $page),
+            fn ($paginator) => $this->hydratePivotRelation($paginator->items()),
+        );
     }
 
     /**
@@ -1083,11 +1084,7 @@ public function each(callable $callback, $count = 1000)
      */
     public function lazy($chunkSize = 1000)
     {
-        return $this->prepareQueryBuilder()->lazy($chunkSize)->map(function ($model) {
-            $this->hydratePivotRelation([$model]);
-
-            return $model;
-        });
+        return $this->prepareQueryBuilder()->lazy($chunkSize)->map($this->hydratePivotRelationFluent(...));
     }
 
     /**
@@ -1106,11 +1103,9 @@ public function lazyById($chunkSize = 1000, $column = null, $alias = null)
 
         $alias ??= $this->getRelatedKeyName();
 
-        return $this->prepareQueryBuilder()->lazyById($chunkSize, $column, $alias)->map(function ($model) {
-            $this->hydratePivotRelation([$model]);
-
-            return $model;
-        });
+        return $this->prepareQueryBuilder()
+            ->lazyById($chunkSize, $column, $alias)
+            ->map($this->hydratePivotRelationFluent(...));
     }
 
     /**
@@ -1129,11 +1124,10 @@ public function lazyByIdDesc($chunkSize = 1000, $column = null, $alias = null)
 
         $alias ??= $this->getRelatedKeyName();
 
-        return $this->prepareQueryBuilder()->lazyByIdDesc($chunkSize, $column, $alias)->map(function ($model) {
-            $this->hydratePivotRelation([$model]);
-
-            return $model;
-        });
+        return $this
+            ->prepareQueryBuilder()
+            ->lazyByIdDesc($chunkSize, $column, $alias)
+            ->map($this->hydratePivotRelationFluent(...));
     }
 
     /**
@@ -1143,11 +1137,7 @@ public function lazyByIdDesc($chunkSize = 1000, $column = null, $alias = null)
      */
     public function cursor()
     {
-        return $this->prepareQueryBuilder()->cursor()->map(function ($model) {
-            $this->hydratePivotRelation([$model]);
-
-            return $model;
-        });
+        return $this->prepareQueryBuilder()->cursor()->map($this->hydratePivotRelationFluent(...));
     }
 
     /**
@@ -1635,4 +1625,11 @@ public function qualifyPivotColumn($column)
                     ? $column
                     : $this->table.'.'.$column;
     }
+
+    private function hydratePivotRelationFluent($model)
+    {
+        $this->hydratePivotRelation([$model]);
+
+        return $model;
+    }
 }
diff --git a/src/Illuminate/Foundation/Console/RouteListCommand.php b/src/Illuminate/Foundation/Console/RouteListCommand.php
@@ -117,11 +117,8 @@ protected function getRoutes()
             return $this->getRouteInformation($route);
         })->filter()->all();
 
-        if (($sort = $this->option('sort')) !== null) {
-            $routes = $this->sortRoutes($sort, $routes);
-        } else {
-            $routes = $this->sortRoutes('uri', $routes);
-        }
+        $sort = $this->option('sort') ?? 'uri';
+        $routes = $this->sortRoutes($sort, $routes);
 
         if ($this->option('reverse')) {
             $routes = array_reverse($routes);