Convert `switch` to `match`

app/Http/Controllers/CarController.php

@@ -224,48 +224,40 @@ class CarController extends Controller
 
     private function getWithCustomSort($cars, string $sortBy, string $direction)
     {
-        switch($sortBy) {
+        return match ($sortBy) {
-            case 'name':
+            'name' => $cars
-                return $cars
                 ->leftJoin('car_models', 'cars.car_model_id', '=', 'car_models.id')
                 ->leftJoin('brands', 'car_models.brand_id', '=', 'brands.id')
                 ->orderBy('brands.name', $direction)
-                    ->orderBy('car_models.name', $direction);
+                ->orderBy('car_models.name', $direction),
-            case 'initial_date':
+            'initial_date' => $cars->orderBy('initial_date', $direction),
-                return $cars->orderBy('initial_date', $direction);
+            'stammnummer' => $cars->orderBy('stammnummer', $direction),
-            case 'stammnummer':
+            'buy_contract.date' => $cars
-                return $cars->orderBy('stammnummer', $direction);
-            case 'buy_contract.date':
-                return $cars
                 ->leftJoin('contracts', function($join) { 
                     $join->on('contracts.car_id', '=', 'cars.id')
                             ->on('contracts.id', '=', DB::raw("(SELECT id from contracts WHERE contracts.car_id = cars.id and type = '0' order by date desc limit 1)")); 
                     })
-                    ->orderBy('contracts.date', $direction);
+                ->orderBy('contracts.date', $direction),
-            case 'buy_contract.price':
+            'buy_contract.price' => $cars
-                return $cars
                 ->leftJoin('contracts', function($join) { 
                     $join->on('contracts.car_id', '=', 'cars.id')
                         ->on('contracts.id', '=', DB::raw("(SELECT id from contracts WHERE contracts.car_id = cars.id and type = '0' order by date desc limit 1)")); 
                     })
-                    ->orderBy('contracts.price', $direction);
+                ->orderBy('contracts.price', $direction),
-            case 'sell_contract.date':
+            'sell_contract.date' => $cars
-                return $cars
                 ->leftJoin('contracts', function($join) { 
                     $join->on('contracts.car_id', '=', 'cars.id')
                             ->on('contracts.id', '=', DB::raw("(SELECT id from contracts WHERE contracts.car_id = cars.id and type = '1' order by date desc limit 1)")); 
                     })
-                    ->orderBy('contracts.date', $direction);
+                ->orderBy('contracts.date', $direction),
-            case 'sell_contract.price':
+            'sell_contract.price' => $cars
-                return $cars
                 ->leftJoin('contracts', function($join) { 
                     $join->on('contracts.car_id', '=', 'cars.id')
                         ->on('contracts.id', '=', DB::raw("(SELECT id from contracts WHERE contracts.car_id = cars.id and type = '1' order by date desc limit 1)")); 
                     })
-                    ->orderBy('contracts.price', $direction);
+                ->orderBy('contracts.price', $direction),
-            default:
+            default => $cars->orderBy('initial_date', $direction),
-                return $cars->orderBy('initial_date', $direction);
+        };
-        }
     }
 
     private function getSortBy(Request $request, $defaultSort)

app/Http/Controllers/ContactController.php

@@ -130,18 +130,13 @@ class ContactController extends Controller
 
     private function getWithCustomSort($contacts, string $sortBy, string $direction)
     {
-        switch($sortBy) {
+        return match ($sortBy) {
-            case 'company':
+            'company' => $contacts->orderBy('company', $direction),
-                return $contacts->orderBy('company', $direction);
+            'fullCity' => $contacts->orderBy('city', $direction),
-            case 'fullCity':
+            'email' => $contacts->orderBy('email', $direction),
-                return $contacts->orderBy('city', $direction);
+            'address' => $contacts->orderBy('address', $direction),
-            case 'email':
+            default => $contacts->orderByName($direction),
-                return $contacts->orderBy('email', $direction);
+        };
-            case 'address':
-                return $contacts->orderBy('address', $direction);
-            default:
-                return $contacts->orderByName($direction);
-        }
     }
 
     private function getSortBy(Request $request)

app/Models/Contract.php

@@ -77,20 +77,14 @@ class Contract extends Model
 
     public function getInsuranceTypeFormattedAttribute()
     {
-        switch ($this->insurance_type) {
+        return match ($this->insurance_type) {
-            case InsuranceType::QBase: 
+            InsuranceType::QBase => 'Q Basis',
-                return 'Q Basis';
+            InsuranceType::OneStar => '1 Stern',
-            case InsuranceType::OneStar:
+            InsuranceType::ThreeStar => '3 Stern',
-                return '1 Stern';
+            InsuranceType::FiveStar => '5 Stern',
-            case InsuranceType::ThreeStar:
+            InsuranceType::FiveStarPlus => '5 Stern+',
-                return '3 Stern';
+            default => 'Nein',
-            case InsuranceType::FiveStar:
+        };
-                return '5 Stern';
-            case InsuranceType::FiveStarPlus:
-                return '5 Stern+';
-            default:
-                return 'Nein';
-        }
     }
 
     public function getDeletedAtAttribute($deleted_at)

app/Models/Payment.php

@@ -43,26 +43,20 @@ class Payment extends Model
     public function getTypeAttribute($type)
     {
          
-        switch ($type) {
+        return match ($type) {
-            case PaymentType::Transaction():
+            PaymentType::Transaction() => 'Banküberweisung',
-                return 'Banküberweisung';
+            PaymentType::Cash() => 'Barzahlung',
-            case PaymentType::Cash():
+            default => 'Überweisung via Cembra',
-                return 'Barzahlung';
+        };;  
-            default:
-                return 'Überweisung via Cembra';
-        };  
     }
 
     public function getTypeTextAttribute()
     {
-        switch ($this->type) {
+        return match ($this->type) {
-            case 'Banküberweisung':
+            'Banküberweisung' => 'via Banküberweisung erhalten',
-                return 'via Banküberweisung erhalten';
+            'Barzahlung' => 'in bar erhalten',
-            case 'Barzahlung':
+            default => 'via Cembra-Überweisung erhalten',
-                return 'in bar erhalten';
+        };;  
-            default:
-                return 'via Cembra-Überweisung erhalten';
-        };  
     }
 
     public function getPrintLinkAttribute()

routes/web.php

@@ -9,7 +9,6 @@ use App\Http\Controllers\PaymentController;
 use App\Http\Controllers\ContractController;
 use App\Http\Controllers\DocumentController;
 use Illuminate\Support\Facades\Route;
-
 Route::middleware(['auth:sanctum', 'verified'])->group(function () {
     Route::get('/', [ContractController::class, 'dashboard'])->name('dashboard');