wip

Author: markvaneijk

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

@@ -31,10 +31,10 @@ public function willCrawl(UriInterface $url, ?string $linkText): void
     public function crawled(
         UriInterface $url,
         ResponseInterface $response,
-        UriInterface $foundOnUrl = null,
+        ?UriInterface $foundOnUrl = null,
         ?string $linkText = null
     ): void {
-        $this->components->info('Crawled and cached url: ' . $url);
+        $this->components->info('Crawled and cached url: '.$url);
     }
 
     /**
@@ -43,10 +43,10 @@ public function crawled(
     public function crawlFailed(
         UriInterface $url,
         RequestException $requestException,
-        UriInterface $foundOnUrl = null,
+        ?UriInterface $foundOnUrl = null,
         ?string $linkText = null
     ): void {
-        $this->components->error('Failed to crawl url: ' . $url);
+        $this->components->error('Failed to crawl url: '.$url);
     }
 
     /**

src/LaravelStatic.php

@@ -19,7 +19,7 @@ public function __construct(Repository $config, Filesystem $files)
         $this->files = $files;
     }
 
-    public function clear(array $paths = null): bool
+    public function clear(?array $paths = null): bool
     {
         $disk = $this->disk();
 
@@ -37,7 +37,7 @@ public function forget(string $path): bool
         return $this->files->delete($path);
     }
 
-    public function disk(string $override = null): FilesystemContract
+    public function disk(?string $override = null): FilesystemContract
     {
         $disk = $override ?? $this->config->get(
             'static.files.disk',

src/Middleware/StaticResponse.php

@@ -94,7 +94,7 @@ public function minifyResponse($response)
         }
 
         $response->setContent(
-            (new HtmlMin())
+            (new HtmlMin)
                 ->minify($response->getContent())
         );
 
@@ -106,29 +106,26 @@ public function minifyResponse($response)
      */
     public function createStaticFile(Request $request, $response): void
     {
-        [$path, $file] = $this->generateFilepath($request, $response);
+        $filePath = $this->generateFilepath($request, $response);
 
-        $filepath = $this->joinPaths([
+        $filePath = $this->joinPaths([
             $request->getHost(),
             $request->method(),
-            $path,
-            $file,
+            $filePath,
         ]);
 
-        if ($this->exceedsMaxLength($filepath)) {
+        if ($this->exceedsMaxLength($filePath)) {
             return;
         }
 
         $disk = LaravelStatic::disk();
 
-        $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('.gitignore')) {
+            $disk->put('.gitignore', '*' . PHP_EOL . '!.gitignore');
         }
 
         if ($response->getContent()) {
-            $disk->put($filepath, $response->getContent(), true);
+            $disk->put($filePath, $response->getContent(), true);
         }
     }
 
@@ -141,15 +138,7 @@ public function getUri(Request $request): string
     }
 
     /**
-     * Get URI in parts.
-     */
-    public function getUriParts(Request $request): array
-    {
-        return array_filter(explode('/', $this->getUri($request)));
-    }
-
-    /**
-     * Get URI in parts.
+     * Get domain from request.
      */
     public function getDomain(Request $request): ?string
     {
@@ -161,16 +150,20 @@ public function getDomain(Request $request): ?string
      */
     public function basePath(Request $request): string
     {
-        $path = $this->config->get('static.path');
-        $path = rtrim($path, '/');
+        $path = $this->getDiskPath();
 
-        if ($this->config->get('static.include_domain')) {
+        if ($this->config->get('static.files.include_domain')) {
             $path .= '/' . $this->getDomain($request);
         }
 
         return $path;
     }
 
+    public function getDiskPath()
+    {
+        return rtrim($this->config->get('filesystems.disks.' . $this->config->get('static.files.disk') . '.root'), '/');
+    }
+
     /**
      * Get file extension based on response content type.
      */
@@ -204,33 +197,22 @@ protected function getFileExtension($filename, $response): ?string
     /**
      * Generate static file path based on request following a matching pattern configured in Nginx
      */
-    public function generateFilepath(Request $request, $response): array
+    public function generateFilepath(Request $request, $response): string
     {
-        $parts = $this->getUriParts($request);
-
-        $filename = '';
-
-        if (! str_ends_with($request->getPathInfo(), '/')) {
-            $filename = array_pop($parts);
-        }
-
-        $path = $this->joinPaths([
-            $this->basePath($request),
-            $parts,
-        ]);
+        $filePath = $request->getPathInfo();
 
-        $filename .= '?';
+        $filePath .= '?';
 
         if (
             $this->config->get('static.files.include_query_string') &&
             ! blank($request->server('QUERY_STRING'))
         ) {
-            $filename .= $request->server('QUERY_STRING');
+            $filePath .= $request->server('QUERY_STRING');
         }
 
-        $filename .= $this->getFileExtension($filename, $response);
+        $filePath .= $this->getFileExtension($filePath, $response);
 
-        return [$path, $filename];
+        return $filePath;
     }
 
     /**

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);
@@ -41,9 +41,9 @@
 <h2>Hello</h2>
 HTML;
 
-    $minified = (new HtmlMin())->minify($html);
+    $minified = (new HtmlMin)->minify($html);
 
-    Route::get('/', fn() => $html)
+    Route::get('/', fn () => $html)
         ->middleware(StaticResponse::class);
 
     $this->get('/');