wip

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Dec 9, 2023 · 7f04bb3 · 7f04bb3
1 parent 1ae5090
commit 7f04bb3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 27 deletions.
diff --git a/src/Concerns/CreatesApplication.php b/src/Concerns/CreatesApplication.php
@@ -389,14 +389,8 @@ protected function resolveApplicationBootstrappers($app)
                 /** @phpstan-ignore-next-line */
                 $this->parseTestMethodAnnotations($app, 'define-env');
             },
-            attribute: function () use ($app) {
-                /** @phpstan-ignore-next-line */
-                $this->parseTestMethodAttributes($app, DefineEnvironment::class);
-            },
-            pest: function () use ($app) {
-                /** @phpstan-ignore-next-line */
-                $this->defineEnvironmentUsingPest($app);
-            }
+            attribute: fn () => $this->parseTestMethodAttributes($app, DefineEnvironment::class), /** @phpstan-ignore-line */
+            pest: fn () => $this->defineEnvironmentUsingPest($app), /** @phpstan-ignore-line */
         );
 
         $this->resolveApplicationRateLimiting($app);

diff --git a/src/Concerns/HandlesDatabases.php b/src/Concerns/HandlesDatabases.php
@@ -48,16 +48,21 @@ protected function setUpDatabaseRequirements(Closure $callback): void
         $attributeCallbacks = $this->resolveTestbenchTestingFeature(
             default: function () {
                 $this->defineDatabaseMigrations();
+
+                $this->beforeApplicationDestroyed(function () {
+                    $this->destroyDatabaseMigrations();
+                });
             },
-            annotation: function () use ($app) {
-                $this->parseTestMethodAnnotations($app, 'define-db');
-            },
-            attribute: function () use ($app) {
-                return $this->parseTestMethodAttributes($app, DefineDatabase::class);
-            },
+            annotation: fn () => $this->parseTestMethodAnnotations($app, 'define-db'),
+            attribute: fn () => $this->parseTestMethodAttributes($app, DefineDatabase::class),
             pest: function () {
                 /** @phpstan-ignore-next-line */
                 $this->defineDatabaseMigrationsUsingPest();
+
+                $this->beforeApplicationDestroyed(function () {
+                    /** @phpstan-ignore-next-line */
+                    $this->destroyDatabaseMigrationsUsingPest();
+                });
             }
         )->get('attribute');
 
@@ -69,11 +74,10 @@ protected function setUpDatabaseRequirements(Closure $callback): void
             });
         }
 
-        $this->defineDatabaseSeeders();
-
-        $this->beforeApplicationDestroyed(function () {
-            $this->destroyDatabaseMigrations();
-        });
+        $this->resolveTestbenchTestingFeature(
+            default: fn () => $this->defineDatabaseSeeders(),
+            pest: fn () => $this->defineDatabaseSeedersUsingPest() /** @phpstan-ignore-line */
+        );
     }
 
     /**

diff --git a/src/Concerns/HandlesRoutes.php b/src/Concerns/HandlesRoutes.php
@@ -34,14 +34,10 @@ protected function setUpApplicationRoutes($app): void
                 $router->middleware('web')
                     ->group(fn ($router) => $this->defineWebRoutes($router));
             },
-            annotation: function () use ($app, $router) {
-                $this->parseTestMethodAnnotations($app, 'define-route', function ($method) use ($router) {
-                    $this->{$method}($router);
-                });
-            },
-            attribute: function () use ($app) {
-                $this->parseTestMethodAttributes($app, DefineRoute::class);
-            },
+            annotation: fn () => $this->parseTestMethodAnnotations($app, 'define-route', function ($method) use ($router) {
+                $this->{$method}($router);
+            }),
+            attribute: fn () => $this->parseTestMethodAttributes($app, DefineRoute::class),
             pest: function () use ($router) {
                 /** @phpstan-ignore-next-line */
                 $this->defineRoutesUsingPest($router);