Tests: Simplify route definitions

rossbearman · Feb 15, 2024 · 3b101dd · 3b101dd
1 parent 8a71360
commit 3b101dd
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 37 deletions.
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -30,3 +30,4 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Fix code style
+          commit_user_name: laravel-pint
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Require this package with [Composer](https://getcomposer.org/).
 Add the `HasSqid` and `SqidBasedRouting` traits to your models.
 
 ```php
-use RossBearman\Sqids\HasSqids;
+use RossBearman\Sqids\HasSqid;
 use RossBearman\Sqids\SqidBasedRouting;
 
 class Customer extends Model
@@ -36,9 +36,7 @@ class Customer extends Model
 
 Create a route for your model.
 ```php
-Route::get('/customer/{customer}', function (Customer $customer) {
-    return $customer;
-});
+Route::get('/customer/{customer}', fn (Customer $customer) => $customer);
 ```
 
 ```php
@@ -95,14 +93,10 @@ class Customer extends Model
 
 ```php
 // Routes by ID by default
-Route::get('/admin/{customer}', function (Customer $customer) {
-    return $customer;
-});
+Route::get('/admin/customer/{customer}', fn (Customer $customer) => $customer);
 
 // Routes by Sqid when specified
-Route::get('/customer/{customer:sqid}', function (Customer $customer) {
-    return $customer;
-});
+Route::get('/customer/{customer:sqid}', fn (Customer $customer) => $customer);
 ```
 
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -32,40 +32,36 @@ protected function getPackageProviders($app): array
 
     protected function defineRoutes($router): void
     {
-        $router->get('/calamari/{calamari}', function (Calamari $calamari) {
-            return $calamari;
-        })->middleware(SubstituteBindings::class);
+        $router->get('/calamari/{calamari}', fn (Calamari $calamari) => $calamari)
+            ->middleware(SubstituteBindings::class);
 
-        $router->get('/calamari/{calamari}/children/{child}', function (Calamari $calamari, Calamari $child) {
-            return $child;
-        })->scopeBindings()->middleware(SubstituteBindings::class);
+        $router->get('/calamari/{calamari}/children/{child}', fn (Calamari $calamari, Calamari $child) => $child)
+            ->middleware(SubstituteBindings::class)
+            ->scopeBindings();
 
-        $router->get('/deleted/calamari/{calamari}', function (Calamari $calamari) {
-            return $calamari;
-        })->withTrashed()->middleware(SubstituteBindings::class);
+        $router->get('/deleted/calamari/{calamari}', fn (Calamari $calamari) => $calamari)
+            ->middleware(SubstituteBindings::class)
+            ->withTrashed();
 
-        $router->get('/squad/{squad}', function (Squad $squad) {
-            return $squad;
-        })->middleware(SubstituteBindings::class);
+        $router->get('/squad/{squad}', fn (Squad $squad) => $squad)
+            ->middleware(SubstituteBindings::class);
 
-        $router->get('/squad/{squad}/calamari/{calamari}', function (Squad $squad, Calamari $calamari) {
-            return $calamari;
-        })->scopeBindings()->middleware(SubstituteBindings::class);
+        $router->get('/squad/{squad}/calamari/{calamari}', fn (Squad $squad, Calamari $calamari) => $calamari)
+            ->middleware(SubstituteBindings::class)
+            ->scopeBindings();
 
-        $router->get('/ocean/{ocean}/calamari/{calamari}', function (Ocean $ocean, Calamari $calamari) {
-            return $calamari;
-        })->scopeBindings()->middleware(SubstituteBindings::class);
+        $router->get('/ocean/{ocean}/calamari/{calamari}', fn (Ocean $ocean, Calamari $calamari) => $calamari)
+            ->middleware(SubstituteBindings::class)
+            ->scopeBindings();
 
-        $router->get('/admin/calamari/{calamari:id}', function (Calamari $calamari) {
-            return $calamari;
-        })->middleware(SubstituteBindings::class);
+        $router->get('/admin/calamari/{calamari:id}', fn (Calamari $calamari) => $calamari)
+            ->middleware(SubstituteBindings::class);
 
-        $router->get('/admin/squad/{squad}/calamari/{calamari:id}', function (Squad $squad, Calamari $calamari) {
-            return $calamari;
-        })->scopeBindings()->middleware(SubstituteBindings::class);
+        $router->get('/admin/squad/{squad}/calamari/{calamari:id}', fn (Squad $squad, Calamari $calamari) => $calamari)
+            ->middleware(SubstituteBindings::class)
+            ->scopeBindings();
 
-        $router->get('/escargot/{calamari:slug}', function (Calamari $calamari) {
-            return $calamari;
-        })->middleware(SubstituteBindings::class);
+        $router->get('/escargot/{calamari:slug}', fn (Calamari $calamari) => $calamari)
+            ->middleware(SubstituteBindings::class);
     }
 }