[1.x] Fixes route:cache command

src/FolioManager.php

@@ -3,7 +3,6 @@
 namespace Laravel\Folio;
 
 use Closure;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Route;
@@ -34,13 +33,6 @@ class FolioManager
      */
     protected ?MatchedView $lastMatchedView = null;
 
-    /**
-     * Create a new Folio manager instance.
-     */
-    public function __construct(protected Application $app)
-    {
-    }
-
     /**
      * Register a route to handle page based routing at the given paths.
      *
@@ -95,7 +87,6 @@ protected function handler(): Closure
             )->all();
 
             return (new RequestHandler(
-                $this,
                 $mountPaths,
                 $this->renderUsing,
                 fn (MatchedView $matchedView) => $this->lastMatchedView = $matchedView,
@@ -148,7 +139,7 @@ public function terminate(): void
     {
         if ($this->terminateUsing) {
             try {
-                ($this->terminateUsing)($this->app);
+                ($this->terminateUsing)();
             } finally {
                 $this->terminateUsing = null;
             }

src/RequestHandler.php

@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Pipeline;
@@ -20,7 +19,6 @@ class RequestHandler
      * @param  array<int, \Laravel\Folio\MountPath>  $mountPaths
      */
     public function __construct(
-        protected FolioManager $manager,
         protected array $mountPaths,
         protected ?Closure $renderUsing = null,
         protected ?Closure $onViewMatch = null,
@@ -60,10 +58,12 @@ public function __invoke(Request $request): mixed
                     ? ($this->renderUsing)($request, $matchedView)
                     : $this->toResponse($matchedView);
 
-                $this->manager->terminateUsing(
-                    fn (Application $app) => $middleware->filter(fn ($middleware) => is_string($middleware) && class_exists($middleware) && method_exists($middleware, 'terminate'))
+                $app = app();
+
+                $app->make(FolioManager::class)->terminateUsing(
+                    fn () => $middleware->filter(fn ($middleware) => is_string($middleware) && class_exists($middleware) && method_exists($middleware, 'terminate'))
                         ->map(fn (string $middleware) => $app->make($middleware))
-                        ->each(fn (object $middleware) => $app->call([$middleware, 'terminate'], ['request' => $request, 'response' => $response]))
+                        ->each(fn (object $middleware) => $app->call([$middleware, 'terminate'], ['request' => $request, 'response' => $response])),
                 );
 
                 return $response;

tests/Feature/Console/RouteCacheCommandTest.php

@@ -0,0 +1,13 @@
+<?php
+
+use Laravel\Folio\Folio;
+
+test('routes may be cached', function () {
+    Folio::route(__DIR__.'/../resources/views/pages');
+
+    $command = $this->artisan('route:cache');
+
+    $command->expectsOutputToContain('Routes cached successfully.');
+
+    $command->assertOk();
+});