wip

Author: markvaneijk

config/static.php

@@ -79,7 +79,7 @@
         'filename_max_length' => 255,
     ],
 
-    'optimizations' => [
+    'optimize' => [
         /**
          * Define if you want to save the static cache after response has been sent to browser.
          */

src/Commands/StaticBuildCommand.php

@@ -40,7 +40,7 @@ public function handle(): void
         match ($driver = $this->config->get('static.driver', 'routes')) {
             'crawler' => $this->cacheWithCrawler(),
             'routes' => $this->cacheWithRoutes(),
-            default => throw new Exception('Static driver '.$driver.' is not supported'),
+            default => throw new Exception('Static driver ' . $driver . ' is not supported'),
         };
     }
 
@@ -50,7 +50,7 @@ public function cacheWithRoutes(): void
          * @var Collection<\Illuminate\Routing\Route> $routes
          */
         $routes = collect(Route::getRoutes()->get('GET'))->filter(
-            fn ($route) => in_array(StaticResponse::class, Route::gatherRouteMiddleware($route)),
+            fn($route) => in_array(StaticResponse::class, Route::gatherRouteMiddleware($route)),
         );
 
         $failed = 0;
@@ -65,24 +65,24 @@ public function cacheWithRoutes(): void
             if (count($route->parameterNames()) !== 0) {
                 $name = $route->getName() ?? $route->uri();
 
-                $this->components->warn('Skipping route: '.$name.', cannot cache routes with parameters');
+                $this->components->warn('Skipping route: ' . $name . ', cannot cache routes with parameters');
 
                 continue;
             }
 
             if (! $response->isOk()) {
-                $this->components->error('Failed to cache route '.$route->uri());
+                $this->components->error('Failed to cache route ' . $route->uri());
 
                 $failed++;
 
                 continue;
             }
 
-            $this->components->info('Route '.$route->uri().' has been cached');
+            $this->components->info('Route ' . $route->uri() . ' has been cached');
         }
 
         if ($failed > 0) {
-            $this->components->warn('Failed to cache '.$failed.' routes');
+            $this->components->warn('Failed to cache ' . $failed . ' routes');
         }
     }
 

src/Crawler/StaticCrawlObserver.php

@@ -34,7 +34,7 @@ public function crawled(
         UriInterface $foundOnUrl = null,
         ?string $linkText = null
     ): void {
-        $this->components->info('Crawled and cached url: '.$url);
+        $this->components->info('Crawled and cached url: ' . $url);
     }
 
     /**
@@ -46,7 +46,7 @@ public function crawlFailed(
         UriInterface $foundOnUrl = null,
         ?string $linkText = null
     ): void {
-        $this->components->error('Failed to crawl url: '.$url);
+        $this->components->error('Failed to crawl url: ' . $url);
     }
 
     /**

src/LaravelStaticServiceProvider.php

@@ -26,7 +26,8 @@ public function packageBooted()
     {
         $kernel = $this->app->make(Kernel::class);
 
-        $kernel->prependMiddlewareToGroup('web',
+        $kernel->prependMiddlewareToGroup(
+            'web',
             PreventStaticResponseMiddleware::class
         );
     }

src/Middleware/StaticResponse.php

@@ -30,7 +30,7 @@ public function handle(Request $request, Closure $next): mixed
         $response = $next($request);
 
         if (
-            ! $this->config->get('static.optimizations.on_termination') &&
+            ! $this->config->get('static.options.on_termination') &&
             $this->shouldBeStatic($request, $response)
         ) {
             $response = $this->minifyResponse($response);
@@ -47,7 +47,7 @@ public function handle(Request $request, Closure $next): mixed
     public function terminate(Request $request, $response): void
     {
         if (
-            $this->config->get('static.optimizations.on_termination') &&
+            $this->config->get('static.options.on_termination') &&
             $this->shouldBeStatic($request, $response)
         ) {
             $response = $this->minifyResponse($response);
@@ -85,7 +85,7 @@ public function joinPaths(array $paths): string
      */
     public function minifyResponse($response)
     {
-        if (! $this->config->get('static.minify_html')) {
+        if (! $this->config->get('static.options.minify_html')) {
             return $response;
         }
 
@@ -123,8 +123,8 @@ public function createStaticFile(Request $request, $response): void
 
         $disk->makeDirectory($path);
 
-        if (! $disk->exists($this->config->get('static.path').'/.gitignore')) {
-            $disk->put($this->config->get('static.path').'/.gitignore', '*'.PHP_EOL.'!.gitignore');
+        if (! $disk->exists($this->config->get('static.path') . '/.gitignore')) {
+            $disk->put($this->config->get('static.path') . '/.gitignore', '*' . PHP_EOL . '!.gitignore');
         }
 
         if ($response->getContent()) {
@@ -165,7 +165,7 @@ public function basePath(Request $request): string
         $path = rtrim($path, '/');
 
         if ($this->config->get('static.include_domain')) {
-            $path .= '/'.$this->getDomain($request);
+            $path .= '/' . $this->getDomain($request);
         }
 
         return $path;
@@ -198,7 +198,7 @@ protected function getFileExtension($filename, $response): ?string
             return null;
         }
 
-        return '.'.$extension;
+        return '.' . $extension;
     }
 
     /**
@@ -222,7 +222,7 @@ public function generateFilepath(Request $request, $response): array
         $filename .= '?';
 
         if (
-            $this->config->get('static.include_query_string') &&
+            $this->config->get('static.files.include_query_string') &&
             ! blank($request->server('QUERY_STRING'))
         ) {
             $filename .= $request->server('QUERY_STRING');

tests/Feature/StaticCacheTest.php

@@ -12,7 +12,7 @@
 
     $disk = LaravelStatic::disk();
 
-    Route::get($route, fn () => $route)
+    Route::get($route, fn() => $route)
         ->middleware(StaticResponse::class);
 
     $this->get($route);
@@ -31,7 +31,7 @@
 it('minifies HTML', function () {
     config([
         'static.files.disk' => 'local',
-        'static.minify_html' => true,
+        'static.options.minify_html' => true,
     ]);
 
     $disk = LaravelStatic::disk();
@@ -43,7 +43,7 @@
 
     $minified = (new HtmlMin())->minify($html);
 
-    Route::get('/', fn () => $html)
+    Route::get('/', fn() => $html)
         ->middleware(StaticResponse::class);
 
     $this->get('/');