fix: return type for get asset files action

cslant · Jan 10, 2024 · 497360d · 497360d
1 parent 0a8496e
commit 497360d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/common/helpers.php b/common/helpers.php
@@ -46,7 +46,7 @@ function lara_gen_adv_asset(string $asset): string
 
         $useAbsolutePath = config('lara-gen-adv.defaults.paths.use_absolute_path');
 
-        return route('lara_gen_adv.asset', ['asset' => $asset], $useAbsolutePath);
+        return route('lara_gen_adv.asset', ['asset' => $asset], $useAbsolutePath).'?v='.filemtime($file);
     }
 }
 

diff --git a/src/Http/Controllers/Asset/AssetController.php b/src/Http/Controllers/Asset/AssetController.php
@@ -13,9 +13,10 @@ class AssetController extends BaseController
 {
     /**
      * @param  Request  $request
-     * @return string
+     *
+     * @return Response
      */
-    public function index(Request $request): string
+    public function index(Request $request): Response
     {
         $fileSystem = new Filesystem();
         $asset = $request->offsetGet('asset');
@@ -27,16 +28,15 @@ public function index(Request $request): string
                 $fileSystem->get($path),
                 200,
                 [
-                    'Content-Type' => pathinfo($asset)['extension'] == 'css'
+                    'Content-Type' => pathinfo($asset, PATHINFO_EXTENSION) == 'css'
                         ? 'text/css'
                         : 'application/javascript',
                 ]
             ))->setSharedMaxAge(31536000)
                 ->setMaxAge(31536000)
-                ->setExpires(new DateTime('+1 year'))
-                ->getContent();
+                ->setExpires(new DateTime('+1 year'));
         } catch (FileNotFoundException $e) {
-            return $e->getMessage();
+            return new Response($e->getMessage(), 404);
         }
     }
 }