From c9d9e6f4778c53ae3c0ca145efe23646746f5454 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Wed, 10 Jan 2024 10:08:53 +0700
Subject: [PATCH 1/3] fix: update package namespace

---
 README.md                                     | 24 +++++++++----------
 common/helpers.php                            | 24 ++++++++++---------
 composer.json                                 | 20 ++++++++--------
 ...tor.php => laravel-generator-advanced.php} |  6 ++---
 lang/en/generator.php                         |  4 ++--
 lang/en/settings.php                          |  2 +-
 phpunit.xml                                   |  2 +-
 resources/views/index.blade.php               |  6 ++---
 resources/views/layouts/app.blade.php         | 12 +++++-----
 .../shared/configurator_settings.blade.php    | 24 +++++++++----------
 resources/views/shared/footer.blade.php       |  2 +-
 resources/views/shared/left_bar.blade.php     |  6 ++---
 resources/views/shared/navbar.blade.php       |  6 ++---
 routes/web.php                                | 12 +++++-----
 ... => LaravelGeneratorAdvancedException.php} |  4 ++--
 src/Helpers/ConfigHelper.php                  | 15 ++++++------
 .../Controllers/Asset/AssetController.php     |  5 ++--
 .../Controllers/Detect/DetectController.php   |  2 +-
 .../Generator/GeneratorController.php         |  2 +-
 .../RepositoryGeneratorController.php         |  4 ++--
 ...=> LaravelGeneratorAdvancedController.php} |  8 +++----
 src/Http/Requests/ApiRequest.php              |  2 +-
 .../Generator/RepositoryGeneratorRequest.php  |  4 ++--
 ...ravelGeneratorAdvancedServiceProvider.php} | 22 ++++++++---------
 tests/Unit/DetectTest.php                     |  4 ++--
 25 files changed, 113 insertions(+), 109 deletions(-)
 rename config/{laravel-generator.php => laravel-generator-advanced.php} (89%)
 rename src/Exceptions/{LaravelGeneratorException.php => LaravelGeneratorAdvancedException.php} (75%)
 rename src/Http/Controllers/{LaravelGeneratorController.php => LaravelGeneratorAdvancedController.php} (67%)
 rename src/Providers/{LaravelGeneratorServiceProvider.php => LaravelGeneratorAdvancedServiceProvider.php} (67%)

diff --git a/README.md b/README.md
index ce54596..d4cfc41 100755
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@
 
 This package is used to generate models, controllers, views, routes, migrations, seeders, factories, requests, and more for Laravel.
 
-[![Latest Version](https://img.shields.io/github/release/cslant/laravel-generator.svg?style=flat-square)](https://github.com/cslant/laravel-generator/releases)
-[![Total Downloads](https://img.shields.io/packagist/dt/cslant/laravel-generator.svg?style=flat-square)](https://packagist.org/packages/cslant/laravel-generator)
-![Test Status](https://img.shields.io/github/actions/workflow/status/cslant/laravel-generator/setup_test.yml?label=tests&branch=main)
+[![Latest Version](https://img.shields.io/github/release/cslant/laravel-generator-advanced.svg?style=flat-square)](https://github.com/cslant/laravel-generator-advanced/releases)
+[![Total Downloads](https://img.shields.io/packagist/dt/cslant/laravel-generator-advanced.svg?style=flat-square)](https://packagist.org/packages/cslant/laravel-generator-advanced)
+![Test Status](https://img.shields.io/github/actions/workflow/status/cslant/laravel-generator-advanced/setup_test.yml?label=tests&branch=main)
 [![StyleCI](https://styleci.io/repos/605697295/shield)](https://styleci.io/repos/605697295)
-[![Quality Score](https://img.shields.io/scrutinizer/g/cslant/laravel-generator.svg?style=flat-square)](https://scrutinizer-ci.com/g/cslant/laravel-generator)
-[![Maintainability](https://api.codeclimate.com/v1/badges/231c123bfa276fd1ac3c/maintainability)](https://codeclimate.com/github/cslant/laravel-generator/maintainability)
+[![Quality Score](https://img.shields.io/scrutinizer/g/cslant/laravel-generator-advanced.svg?style=flat-square)](https://scrutinizer-ci.com/g/cslant/laravel-generator-advanced)
+[![Maintainability](https://api.codeclimate.com/v1/badges/231c123bfa276fd1ac3c/maintainability)](https://codeclimate.com/github/cslant/laravel-generator-advanced/maintainability)
 
 ## Technology
 
@@ -20,7 +20,7 @@ This package is used to generate models, controllers, views, routes, migrations,
 You can install the package with [Composer](https://getcomposer.org/) using the following command:
 
 ```bash
-composer require cslant/laravel-generator
+composer require cslant/laravel-generator-advanced
 ```
 
 ## Publish the config file, views, and language files
@@ -28,26 +28,26 @@ composer require cslant/laravel-generator
 If you want to change the default configuration, the views, or the language files, you can publish them with the following command:
 
 ```bash
- php artisan vendor:publish --provider="CSlant\LaravelGenerator\Providers\LaravelGeneratorServiceProvider" 
+ php artisan vendor:publish --provider="CSlant\LaraGenAdv\Providers\LaravelGeneratorServiceProvider" 
 ```
 
 If you have run the above command, you will see the following files in your project:
 
-- `config/laravel-generator.php`
-- `resources/views/vendor/laravel-generator`
+- `config/laravel-generator-advanced.php`
+- `resources/views/vendor/laravel-generator-advanced`
 
 ---
 
 Also, you can publish only the config file with the following command:
 
 ```bash
- php artisan vendor:publish --provider="CSlant\LaravelGenerator\Providers\LaravelGeneratorServiceProvider" --tag="config" 
+ php artisan vendor:publish --provider="CSlant\LaraGenAdv\Providers\LaravelGeneratorServiceProvider" --tag="config" 
 ```
 
 Similarly, you can publish only the views with the following command:
 
 ```bash
- php artisan vendor:publish --provider="CSlant\LaravelGenerator\Providers\LaravelGeneratorServiceProvider" --tag="views" 
+ php artisan vendor:publish --provider="CSlant\LaraGenAdv\Providers\LaravelGeneratorServiceProvider" --tag="views" 
 ```
 
 
@@ -56,7 +56,7 @@ Similarly, you can publish only the views with the following command:
 The MIT License (MIT). Please see [License File](LICENSE) for more information.
 
 <p align="center">
-    <a href="https://packagist.org/packages/cslant/laravel-generator">
+    <a href="https://packagist.org/packages/cslant/laravel-generator-advanced">
         <img src="https://img.shields.io/packagist/l/doctrine/orm.svg" data-origin="https://img.shields.io/packagist/l/doctrine/orm.svg" alt="license">
     </a>
 </p>
diff --git a/common/helpers.php b/common/helpers.php
index 488cd78..e8ebb9b 100644
--- a/common/helpers.php
+++ b/common/helpers.php
@@ -1,18 +1,18 @@
 <?php
 
-use CSlant\LaravelGenerator\Exceptions\LaravelGeneratorException;
+use CSlant\LaraGenAdv\Exceptions\LaravelGeneratorAdvancedException;
 
 if (!function_exists('laravel_generator_dist_path')) {
     /**
-     * Returns laravel-generator composer dist path.
+     * Returns laravel-generator-advanced composer dist path.
      *
      * @param  string|null  $asset
      * @return string
      */
     function laravel_generator_dist_path(string $asset = null): string
     {
-        $defaultPath = config('laravel-generator.defaults.paths.ui_package_path').'/dist/';
-        $assetPath = config('laravel-generator.defaults.paths.laravel_generator_assets_path', $defaultPath);
+        $defaultPath = config('lara-gen-adv.defaults.paths.ui_package_path').'/dist/';
+        $assetPath = config('lara-gen-adv.defaults.paths.laravel_generator_assets_path', $defaultPath);
         if (!str_ends_with($assetPath, '/')) {
             $assetPath .= '/';
         }
@@ -28,22 +28,23 @@ function laravel_generator_dist_path(string $asset = null): string
 
 if (!function_exists('laravel_generator_asset')) {
     /**
-     * Returns asset from laravel-generator composer package.
+     * Returns asset from laravel-generator-advanced composer package.
      *
      * @param  string  $asset
+     *
      * @return string
      *
-     * @throws LaravelGeneratorException
+     * @throws LaravelGeneratorAdvancedException
      */
     function laravel_generator_asset(string $asset): string
     {
         $file = laravel_generator_dist_path($asset);
 
         if (!file_exists($file)) {
-            throw new LaravelGeneratorException(sprintf('%s - this Laravel Generator asset does not exist', $asset));
+            throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator asset does not exist', $asset));
         }
 
-        $useAbsolutePath = config('laravel-generator.defaults.paths.use_absolute_path');
+        $useAbsolutePath = config('lara-gen-adv.defaults.paths.use_absolute_path');
 
         return route('laravel_generator.asset', ['asset' => $asset], $useAbsolutePath).'?v='.filemtime($file);
     }
@@ -51,12 +52,13 @@ function laravel_generator_asset(string $asset): string
 
 if (!function_exists('laravel_generator_dist_path_allowed')) {
     /**
-     * Returns asset allowed from laravel-generator composer package.
+     * Returns asset allowed from laravel-generator-advanced composer package.
      *
      * @param  string  $asset
+     *
      * @return string
      *
-     * @throws LaravelGeneratorException
+     * @throws LaravelGeneratorAdvancedException
      */
     function laravel_generator_asset_allowed(string $asset): string
     {
@@ -66,7 +68,7 @@ function laravel_generator_asset_allowed(string $asset): string
         ];
 
         if (!in_array($asset, $allowed_files)) {
-            throw new LaravelGeneratorException(sprintf('%s - this Laravel Generator asset is not allowed', $asset));
+            throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator asset is not allowed', $asset));
         }
 
         return laravel_generator_asset($asset);
diff --git a/composer.json b/composer.json
index ad71834..ccde769 100755
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,12 @@
 {
-    "name": "cslant/laravel-generator",
-    "description": "Laravel Generator",
-    "homepage": "https://github.com/cslant/laravel-generator",
+    "name": "cslant/laravel-generator-advanced",
+    "description": "Laravel Generator Advanced is a package that helps you generate CRUD, Migration, Model, Controller, Repository, Request, Resource, Factory, Seeder, Action, ...",
+    "homepage": "https://github.com/cslant/laravel-generator-advanced",
     "type": "library",
     "license": "MIT",
     "keywords": [
-        "laravel",
-        "generator",
+        "laravel generator",
+        "generator advanced",
         "crud generator",
         "migration generator",
         "model generator",
@@ -17,17 +17,17 @@
         "factory",
         "seeder",
         "action",
-        "laravel generator",
+        "laravel generator advanced",
         "cslant"
     ],
     "autoload": {
         "psr-4": {
-            "CSlant\\LaravelGenerator\\": "src/"
+            "CSlant\\LaraGenAdv\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "CSlant\\LaravelGenerator\\Tests\\": "tests/"
+            "CSlant\\LaraGenAdv\\Tests\\": "tests/"
         }
     },
     "authors": [
@@ -60,12 +60,12 @@
         "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
     },
     "support": {
-        "issues": "https://github.com/cslant/laravel-generator/issues"
+        "issues": "https://github.com/cslant/laravel-generator-advanced/issues"
     },
     "extra": {
         "laravel": {
             "providers": [
-                "CSlant\\LaravelGenerator\\Providers\\LaravelGeneratorServiceProvider"
+                "CSlant\\LaraGenAdv\\Providers\\LaravelGeneratorAdvancedServiceProvider"
             ]
         }
     },
diff --git a/config/laravel-generator.php b/config/laravel-generator-advanced.php
similarity index 89%
rename from config/laravel-generator.php
rename to config/laravel-generator-advanced.php
index 0ef5a25..2d4c58f 100644
--- a/config/laravel-generator.php
+++ b/config/laravel-generator-advanced.php
@@ -3,7 +3,7 @@
 return [
     'default' => 'default',
 
-    'app_name' => 'Laravel Generator',
+    'app_name' => 'Laravel Generator Advanced',
 
     'generators' => [
         'default' => [
@@ -11,7 +11,7 @@
 
             'routes' => [
                 /* Route for laravel generator tool */
-                'tool' => env('TH_LARAVEL_GENERATOR_TOOL_ROUTE', 'laravel-generator'),
+                'tool' => env('TH_LARAVEL_GENERATOR_TOOL_ROUTE', 'laravel-generator-advanced'),
             ],
         ],
     ],
@@ -21,7 +21,7 @@
             /* Edit to include full URL in ui for assets */
             'use_absolute_path' => env('TH_LARAVEL_GENERATOR_USE_ABSOLUTE_PATH', true),
 
-            'views' => base_path('resources/views/vendor/laravel-generator'),
+            'views' => base_path('resources/views/vendor/laravel-generator-advanced'),
 
             'ui_package_path' => 'vendor/cslant/laravel-generator-ui',
 
diff --git a/lang/en/generator.php b/lang/en/generator.php
index d491e67..39f84b4 100644
--- a/lang/en/generator.php
+++ b/lang/en/generator.php
@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'app_name' => 'Laravel Generator',
-    'dashboard' => 'Laravel Generator Dashboard',
+    'app_name' => 'Laravel Generator Advanced',
+    'dashboard' => 'Laravel Generator Advanced Dashboard',
 ];
diff --git a/lang/en/settings.php b/lang/en/settings.php
index a0827d6..0a049fa 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'title' => 'Laravel Generator Config',
+    'title' => 'Laravel Generator Advanced Configuration',
     'description' => 'You can change the sidenav type just on desktop view.',
     'see_options' => 'See options.',
     'sidebar' => [
diff --git a/phpunit.xml b/phpunit.xml
index afdc875..4deee81 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,7 +13,7 @@
         </include>
     </coverage>
     <testsuites>
-        <testsuite name="CSlant LaravelGenerator Test Suite">
+        <testsuite name="CSlant Laravel Generator Advanced Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 8a5f8db..1d251f8 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -1,7 +1,7 @@
-@extends('laravel-generator::layouts.app')
+@extends('lara-gen-adv::layouts.app')
 
-@section('title', __('laravel-generator::generator.dashboard'))
+@section('title', __('lara-gen-adv::generator.dashboard'))
 
-@section('laravel-generator-content')
+@section('lara-gen-adv-content')
 
 @endsection
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 79ab0c0..5ed08c6 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -7,7 +7,7 @@
     <link rel="apple-touch-icon" sizes="76x76" href="#">
     <link rel="icon" type="image/png" href="#">
     <title>
-        @yield('title', config('laravel-generator.app_name', __('laravel-generator::generator.app_name')))
+        @yield('title', config('lara-gen-adv.app_name', __('lara-gen-adv::generator.app_name')))
     </title>
     <!-- Fonts and icons -->
     <link rel="stylesheet" type="text/css"
@@ -22,17 +22,17 @@
 </head>
 
 <body class="g-sidenav-show bg-gray-200">
-@include('laravel-generator::shared.left_bar')
+@include('lara-gen-adv::shared.left_bar')
 
 <div class="main-content position-relative max-height-vh-100 h-100">
     <!-- Navbar -->
-    @include('laravel-generator::shared.navbar')
+    @include('lara-gen-adv::shared.navbar')
     <!-- End Navbar -->
 
-    @yield('laravel-generator-content')
+    @yield('lara-gen-adv-content')
 </div>
 
-@include('laravel-generator::shared.configurator_settings')
+@include('lara-gen-adv::shared.configurator_settings')
 
-@include('laravel-generator::shared.footer')
+@include('lara-gen-adv::shared.footer')
 </body>
diff --git a/resources/views/shared/configurator_settings.blade.php b/resources/views/shared/configurator_settings.blade.php
index eb69f6b..457b7a2 100644
--- a/resources/views/shared/configurator_settings.blade.php
+++ b/resources/views/shared/configurator_settings.blade.php
@@ -5,8 +5,8 @@
     <div class="card shadow-lg">
         <div class="card-header pb-0 pt-3">
             <div class="float-start">
-                <h5 class="mt-3 mb-0">{{ __('laravel-generator::settings.title') }}</h5>
-                <p>{{ __('laravel-generator::settings.see_options') }}</p>
+                <h5 class="mt-3 mb-0">{{ __('lara-gen-adv::settings.title') }}</h5>
+                <p>{{ __('lara-gen-adv::settings.see_options') }}</p>
             </div>
             <div class="float-end mt-4">
                 <button class="btn btn-link text-dark p-0 fixed-plugin-close-button">
@@ -19,7 +19,7 @@
         <div class="card-body pt-sm-3 pt-0">
             <!-- Sidebar Backgrounds -->
             <div>
-                <h6 class="mb-0">{{ __('laravel-generator::settings.sidebar.color') }}</h6>
+                <h6 class="mb-0">{{ __('lara-gen-adv::settings.sidebar.color') }}</h6>
             </div>
             <a href="javascript:void(0)" class="switch-trigger background-color">
                 <div class="badge-colors my-2 text-start">
@@ -33,25 +33,25 @@
             </a>
             <!-- Sidenav Type -->
             <div class="mt-3">
-                <h6 class="mb-0">{{ __('laravel-generator::settings.sidebar.nav_type') }}</h6>
-                <p class="text-sm">{{ __('laravel-generator::settings.sidebar.nav_description') }}</p>
+                <h6 class="mb-0">{{ __('lara-gen-adv::settings.sidebar.nav_type') }}</h6>
+                <p class="text-sm">{{ __('lara-gen-adv::settings.sidebar.nav_description') }}</p>
             </div>
             <div class="d-flex">
-                <button class="btn bg-gradient-dark px-3 mb-2 active" data-class="bg-gradient-dark" onclick="sidebarType(this)">{{ __('laravel-generator::settings.sidebar.dark') }}</button>
-                <button class="btn bg-gradient-dark px-3 mb-2 ms-2" data-class="bg-transparent" onclick="sidebarType(this)">{{ __('laravel-generator::settings.sidebar.transparent') }}</button>
-                <button class="btn bg-gradient-dark px-3 mb-2 ms-2" data-class="bg-white" onclick="sidebarType(this)">{{ __('laravel-generator::settings.sidebar.light') }}</button>
+                <button class="btn bg-gradient-dark px-3 mb-2 active" data-class="bg-gradient-dark" onclick="sidebarType(this)">{{ __('lara-gen-adv::settings.sidebar.dark') }}</button>
+                <button class="btn bg-gradient-dark px-3 mb-2 ms-2" data-class="bg-transparent" onclick="sidebarType(this)">{{ __('lara-gen-adv::settings.sidebar.transparent') }}</button>
+                <button class="btn bg-gradient-dark px-3 mb-2 ms-2" data-class="bg-white" onclick="sidebarType(this)">{{ __('lara-gen-adv::settings.sidebar.light') }}</button>
             </div>
-            <p class="text-sm d-xl-none d-block mt-2">{{ __('laravel-generator::settings.description') }}</p>
+            <p class="text-sm d-xl-none d-block mt-2">{{ __('lara-gen-adv::settings.description') }}</p>
             <!-- Navbar Fixed -->
             <div class="mt-3 d-flex">
-                <h6 class="mb-0">{{ __('laravel-generator::settings.sidebar.nav_fixed') }}</h6>
+                <h6 class="mb-0">{{ __('lara-gen-adv::settings.sidebar.nav_fixed') }}</h6>
                 <div class="form-check form-switch ps-0 ms-auto my-auto">
                     <label for="navbarFixed"></label><input class="form-check-input mt-1 ms-auto" type="checkbox" id="navbarFixed" onclick="navbarFixed(this)">
                 </div>
             </div>
             <hr class="horizontal dark my-3">
             <div class="mt-2 d-flex">
-                <h6 class="mb-0">{{ __('laravel-generator::settings.sidebar.light') }} / {{ __('laravel-generator::settings.sidebar.dark') }}</h6>
+                <h6 class="mb-0">{{ __('lara-gen-adv::settings.sidebar.light') }} / {{ __('lara-gen-adv::settings.sidebar.dark') }}</h6>
                 <div class="form-check form-switch ps-0 ms-auto my-auto">
                     <label for="dark-version"></label><input class="form-check-input mt-1 ms-auto" type="checkbox" id="dark-version" onclick="darkMode(this)">
                 </div>
@@ -59,4 +59,4 @@
             <hr class="horizontal dark my-sm-4">
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/shared/footer.blade.php b/resources/views/shared/footer.blade.php
index 3ae7f4b..5ca969f 100644
--- a/resources/views/shared/footer.blade.php
+++ b/resources/views/shared/footer.blade.php
@@ -11,4 +11,4 @@
 </script>
 <script src="{{ laravel_generator_asset('js/material-dashboard.min.js') }}"></script>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/resources/views/shared/left_bar.blade.php b/resources/views/shared/left_bar.blade.php
index 6bb89a0..2735489 100644
--- a/resources/views/shared/left_bar.blade.php
+++ b/resources/views/shared/left_bar.blade.php
@@ -1,9 +1,9 @@
 <aside class="sidenav navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-start ms-3   bg-gradient-dark" id="sidenav-main">
     <div class="sidenav-header">
         <i class="fas fa-times p-3 cursor-pointer text-white opacity-5 position-absolute end-0 top-0 d-none d-xl-none" aria-hidden="true" id="iconSidenav"></i>
-        <a class="navbar-brand m-0" href="https://github.com/cslant/laravel-generator" target="_blank">
+        <a class="navbar-brand m-0" href="https://github.com/cslant/laravel-generator-advanced" target="_blank">
             <img src="../assets/img/logo-ct.png" class="navbar-brand-img h-100" alt="main logo">
-            <span class="ms-1 font-weight-bold text-white">{{ __('laravel-generator::generator.app_name') }}</span>
+            <span class="ms-1 font-weight-bold text-white">{{ __('lara-gen-adv::generator.app_name') }}</span>
         </a>
     </div>
     <hr class="horizontal light mt-0 mb-2">
@@ -14,7 +14,7 @@
                     <div class="text-white text-center me-2 d-flex align-items-center justify-content-center">
                         <i class="material-icons opacity-10">dashboard</i>
                     </div>
-                    <span class="nav-link-text ms-1">{{ __('laravel-generator::settings.sidebar.dashboard') }}</span>
+                    <span class="nav-link-text ms-1">{{ __('lara-gen-adv::settings.sidebar.dashboard') }}</span>
                 </a>
             </li>
         </ul>
diff --git a/resources/views/shared/navbar.blade.php b/resources/views/shared/navbar.blade.php
index c7ed462..16e3181 100644
--- a/resources/views/shared/navbar.blade.php
+++ b/resources/views/shared/navbar.blade.php
@@ -3,9 +3,9 @@
         <nav aria-label="breadcrumb">
             <ol class="breadcrumb bg-transparent mb-0 pb-0 pt-1 px-0 me-sm-6 me-5">
                 <li class="breadcrumb-item text-sm">
-                    <a class="opacity-5 text-dark" href="javascript:void(0);">{{ config('laravel-generator.app_name') }}</a>
+                    <a class="opacity-5 text-dark" href="javascript:void(0);">{{ config('lara-gen-adv.app_name') }}</a>
                 </li>
-                <li class="breadcrumb-item text-sm text-dark active" aria-current="page">@yield('title', config('laravel-generator.app_name', __('laravel-generator::generator.app_name')))</li>
+                <li class="breadcrumb-item text-sm text-dark active" aria-current="page">@yield('title', config('lara-gen-adv.app_name', __('lara-gen-adv::generator.app_name')))</li>
             </ol>
         </nav>
         <div class="collapse navbar-collapse mt-sm-0 mt-2 me-md-0 me-sm-4" id="navbar">
@@ -22,4 +22,4 @@
             </ul>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/routes/web.php b/routes/web.php
index f6a675c..73e012e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,18 +1,18 @@
 <?php
 
-use CSlant\LaravelGenerator\Helpers\ConfigHelper;
-use CSlant\LaravelGenerator\Http\Controllers\Asset\AssetController;
-use CSlant\LaravelGenerator\Http\Controllers\Generator\RepositoryGeneratorController;
-use CSlant\LaravelGenerator\Http\Controllers\LaravelGeneratorController;
+use CSlant\LaraGenAdv\Helpers\ConfigHelper;
+use CSlant\LaraGenAdv\Http\Controllers\Asset\AssetController;
+use CSlant\LaraGenAdv\Http\Controllers\Generator\RepositoryGeneratorController;
+use CSlant\LaraGenAdv\Http\Controllers\LaravelGeneratorAdvancedController;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
 
-Route::namespace('CSlant\LaravelGenerator\Http\Controllers')->group(function () {
+Route::namespace('CSlant\LaraGenAdv\Http\Controllers')->group(function () {
     $configRepository = resolve(ConfigHelper::class);
     $generatorConfig = $configRepository->generatorConfig();
 
     Route::prefix($generatorConfig['routes']['tool'])->group(function (Router $router) {
-        Route::get('/', [LaravelGeneratorController::class, 'index'])->name('laravel_generator.index');
+        Route::get('/', [LaravelGeneratorAdvancedController::class, 'index'])->name('laravel_generator.index');
 
         Route::get('asset/{asset}', [AssetController::class, 'index'])
             ->name('laravel_generator.asset')
diff --git a/src/Exceptions/LaravelGeneratorException.php b/src/Exceptions/LaravelGeneratorAdvancedException.php
similarity index 75%
rename from src/Exceptions/LaravelGeneratorException.php
rename to src/Exceptions/LaravelGeneratorAdvancedException.php
index 33bac18..fd725cc 100644
--- a/src/Exceptions/LaravelGeneratorException.php
+++ b/src/Exceptions/LaravelGeneratorAdvancedException.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Exceptions;
+namespace CSlant\LaraGenAdv\Exceptions;
 
 use Exception;
 
-class LaravelGeneratorException extends Exception
+class LaravelGeneratorAdvancedException extends Exception
 {
     /**
      * @param  string  $message
diff --git a/src/Helpers/ConfigHelper.php b/src/Helpers/ConfigHelper.php
index cedc462..cdbf07f 100644
--- a/src/Helpers/ConfigHelper.php
+++ b/src/Helpers/ConfigHelper.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Helpers;
+namespace CSlant\LaraGenAdv\Helpers;
 
-use CSlant\LaravelGenerator\Exceptions\LaravelGeneratorException;
+use CSlant\LaraGenAdv\Exceptions\LaravelGeneratorAdvancedException;
 
 class ConfigHelper
 {
@@ -10,21 +10,22 @@ class ConfigHelper
      * Get config.
      *
      * @param  string|null  $generatorName
+     *
      * @return array
      *
-     * @throws LaravelGeneratorException
+     * @throws LaravelGeneratorAdvancedException
      */
     public function generatorConfig(?string $generatorName = null): array
     {
         if ($generatorName === null) {
-            $generatorName = config('laravel-generator.default');
+            $generatorName = config('lara-gen-adv.default');
         }
 
-        $defaults = config('laravel-generator.defaults', []);
-        $generators = config('laravel-generator.generators', []);
+        $defaults = config('lara-gen-adv.defaults', []);
+        $generators = config('lara-gen-adv.generators', []);
 
         if (!isset($generators[$generatorName])) {
-            throw new LaravelGeneratorException('Generator name not found');
+            throw new LaravelGeneratorAdvancedException('Generator name not found');
         }
 
         return $this->mergeConfig($defaults, $generators[$generatorName]);
diff --git a/src/Http/Controllers/Asset/AssetController.php b/src/Http/Controllers/Asset/AssetController.php
index d674923..d2ce411 100644
--- a/src/Http/Controllers/Asset/AssetController.php
+++ b/src/Http/Controllers/Asset/AssetController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Http\Controllers\Asset;
+namespace CSlant\LaraGenAdv\Http\Controllers\Asset;
 
 use DateTime;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
@@ -33,7 +33,8 @@ public function index(Request $request): string
                 ]
             ))->setSharedMaxAge(31536000)
                 ->setMaxAge(31536000)
-                ->setExpires(new DateTime('+1 year'));
+                ->setExpires(new DateTime('+1 year'))
+                ->getContent();
         } catch (FileNotFoundException $e) {
             return $e->getMessage();
         }
diff --git a/src/Http/Controllers/Detect/DetectController.php b/src/Http/Controllers/Detect/DetectController.php
index 844436b..eb6236f 100644
--- a/src/Http/Controllers/Detect/DetectController.php
+++ b/src/Http/Controllers/Detect/DetectController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Http\Controllers\Detect;
+namespace CSlant\LaraGenAdv\Http\Controllers\Detect;
 
 use Illuminate\Routing\Controller;
 use RecursiveDirectoryIterator;
diff --git a/src/Http/Controllers/Generator/GeneratorController.php b/src/Http/Controllers/Generator/GeneratorController.php
index e8a7607..19a00d6 100644
--- a/src/Http/Controllers/Generator/GeneratorController.php
+++ b/src/Http/Controllers/Generator/GeneratorController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Http\Controllers\Generator;
+namespace CSlant\LaraGenAdv\Http\Controllers\Generator;
 
 use Illuminate\Routing\Controller;
 
diff --git a/src/Http/Controllers/Generator/RepositoryGeneratorController.php b/src/Http/Controllers/Generator/RepositoryGeneratorController.php
index edc2126..d09e5f3 100644
--- a/src/Http/Controllers/Generator/RepositoryGeneratorController.php
+++ b/src/Http/Controllers/Generator/RepositoryGeneratorController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Http\Controllers\Generator;
+namespace CSlant\LaraGenAdv\Http\Controllers\Generator;
 
-use CSlant\LaravelGenerator\Http\Controllers\Detect\DetectController;
+use CSlant\LaraGenAdv\Http\Controllers\Detect\DetectController;
 use Illuminate\Support\Str;
 
 class RepositoryGeneratorController extends GeneratorController
diff --git a/src/Http/Controllers/LaravelGeneratorController.php b/src/Http/Controllers/LaravelGeneratorAdvancedController.php
similarity index 67%
rename from src/Http/Controllers/LaravelGeneratorController.php
rename to src/Http/Controllers/LaravelGeneratorAdvancedController.php
index 259f5d0..a24395b 100644
--- a/src/Http/Controllers/LaravelGeneratorController.php
+++ b/src/Http/Controllers/LaravelGeneratorAdvancedController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Http\Controllers;
+namespace CSlant\LaraGenAdv\Http\Controllers;
 
-use CSlant\LaravelGenerator\Http\Controllers\Detect\DetectController;
+use CSlant\LaraGenAdv\Http\Controllers\Detect\DetectController;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 
-class LaravelGeneratorController extends Controller
+class LaravelGeneratorAdvancedController extends Controller
 {
     /**
      * @param  Request  $request
@@ -20,6 +20,6 @@ public function index(Request $request)
         $detectPatternController = new DetectController();
         $repositories = $detectPatternController->detect();
 
-        return view('laravel-generator::index');
+        return view('lara-gen-adv::index');
     }
 }
diff --git a/src/Http/Requests/ApiRequest.php b/src/Http/Requests/ApiRequest.php
index 99c527f..1764b9f 100644
--- a/src/Http/Requests/ApiRequest.php
+++ b/src/Http/Requests/ApiRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Http\Requests;
+namespace CSlant\LaraGenAdv\Http\Requests;
 
 use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/src/Http/Requests/Generator/RepositoryGeneratorRequest.php b/src/Http/Requests/Generator/RepositoryGeneratorRequest.php
index 291a0ef..f6889c7 100644
--- a/src/Http/Requests/Generator/RepositoryGeneratorRequest.php
+++ b/src/Http/Requests/Generator/RepositoryGeneratorRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Http\Requests\Generator;
+namespace CSlant\LaraGenAdv\Http\Requests\Generator;
 
-use CSlant\LaravelGenerator\Http\Requests\ApiRequest;
+use CSlant\LaraGenAdv\Http\Requests\ApiRequest;
 
 class RepositoryGeneratorRequest extends ApiRequest
 {
diff --git a/src/Providers/LaravelGeneratorServiceProvider.php b/src/Providers/LaravelGeneratorAdvancedServiceProvider.php
similarity index 67%
rename from src/Providers/LaravelGeneratorServiceProvider.php
rename to src/Providers/LaravelGeneratorAdvancedServiceProvider.php
index b540b96..8d0c808 100755
--- a/src/Providers/LaravelGeneratorServiceProvider.php
+++ b/src/Providers/LaravelGeneratorAdvancedServiceProvider.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Providers;
+namespace CSlant\LaraGenAdv\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
-class LaravelGeneratorServiceProvider extends ServiceProvider
+class LaravelGeneratorAdvancedServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap services.
@@ -14,14 +14,14 @@ class LaravelGeneratorServiceProvider extends ServiceProvider
     public function boot(): void
     {
         $viewPath = __DIR__.'/../../resources/views';
-        $this->loadViewsFrom($viewPath, 'laravel-generator');
+        $this->loadViewsFrom($viewPath, 'lara-gen-adv');
 
         $routePath = __DIR__.'/../../routes/web.php';
         if (file_exists($routePath)) {
             $this->loadRoutesFrom($routePath);
         }
 
-        $this->loadTranslationsFrom(__DIR__.'/../../lang', 'laravel-generator');
+        $this->loadTranslationsFrom(__DIR__.'/../../lang', 'lara-gen-adv');
 
         // Load package helpers file
         $helpersPath = __DIR__.'/../../common/helpers.php';
@@ -40,8 +40,8 @@ public function boot(): void
      */
     public function register(): void
     {
-        $configPath = __DIR__.'/../../config/laravel-generator.php';
-        $this->mergeConfigFrom($configPath, 'laravel-generator');
+        $configPath = __DIR__.'/../../config/laravel-generator-advanced.php';
+        $this->mergeConfigFrom($configPath, 'lara-gen-adv');
     }
 
     /**
@@ -51,7 +51,7 @@ public function register(): void
      */
     public function provides(): ?array
     {
-        return ['laravel-generator'];
+        return ['lara-gen-adv'];
     }
 
     /**
@@ -59,17 +59,17 @@ public function provides(): ?array
      */
     protected function registerAssetPublishing(): void
     {
-        $configPath = __DIR__.'/../../config/laravel-generator.php';
+        $configPath = __DIR__.'/../../config/laravel-generator-advanced.php';
         $this->publishes([
-            $configPath => config_path('laravel-generator.php'),
+            $configPath => config_path('laravel-generator-advanced.php'),
         ], 'config');
 
         $this->publishes([
-            __DIR__.'/../../resources/views' => config('laravel-generator.defaults.paths.views'),
+            __DIR__.'/../../resources/views' => config('lara-gen-adv.defaults.paths.views'),
         ], 'views');
 
         $this->publishes([
-            __DIR__.'/../../lang' => resource_path('lang/vendor/laravel-generator'),
+            __DIR__.'/../../lang' => resource_path('lang/vendor/laravel-generator-advanced'),
         ], 'lang');
     }
 }
diff --git a/tests/Unit/DetectTest.php b/tests/Unit/DetectTest.php
index a58fc25..2aa8753 100644
--- a/tests/Unit/DetectTest.php
+++ b/tests/Unit/DetectTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CSlant\LaravelGenerator\Tests\Unit;
+namespace CSlant\LaraGenAdv\Tests\Unit;
 
-use CSlant\LaravelGenerator\Http\Controllers\Detect\DetectController;
+use CSlant\LaraGenAdv\Http\Controllers\Detect\DetectController;
 use Mockery;
 use PHPUnit\Framework\TestCase;
 

From 0a8496e0c67ea35d2c92cd05abc799838bfea069 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Wed, 10 Jan 2024 10:27:35 +0700
Subject: [PATCH 2/3] fix: update name for helper functions and routes

---
 common/helpers.php                            | 22 +++++++++----------
 config/laravel-generator-advanced.php         |  8 +++----
 resources/views/layouts/app.blade.php         |  2 +-
 resources/views/shared/footer.blade.php       |  4 ++--
 routes/web.php                                |  6 ++---
 .../Controllers/Asset/AssetController.php     |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/helpers.php b/common/helpers.php
index e8ebb9b..eec03f4 100644
--- a/common/helpers.php
+++ b/common/helpers.php
@@ -2,17 +2,17 @@
 
 use CSlant\LaraGenAdv\Exceptions\LaravelGeneratorAdvancedException;
 
-if (!function_exists('laravel_generator_dist_path')) {
+if (!function_exists('lara_gen_adv_dist_path')) {
     /**
      * Returns laravel-generator-advanced composer dist path.
      *
      * @param  string|null  $asset
      * @return string
      */
-    function laravel_generator_dist_path(string $asset = null): string
+    function lara_gen_adv_dist_path(string $asset = null): string
     {
         $defaultPath = config('lara-gen-adv.defaults.paths.ui_package_path').'/dist/';
-        $assetPath = config('lara-gen-adv.defaults.paths.laravel_generator_assets_path', $defaultPath);
+        $assetPath = config('lara-gen-adv.defaults.paths.lara_gen_adv_assets_path', $defaultPath);
         if (!str_ends_with($assetPath, '/')) {
             $assetPath .= '/';
         }
@@ -26,7 +26,7 @@ function laravel_generator_dist_path(string $asset = null): string
     }
 }
 
-if (!function_exists('laravel_generator_asset')) {
+if (!function_exists('lara_gen_adv_asset')) {
     /**
      * Returns asset from laravel-generator-advanced composer package.
      *
@@ -36,9 +36,9 @@ function laravel_generator_dist_path(string $asset = null): string
      *
      * @throws LaravelGeneratorAdvancedException
      */
-    function laravel_generator_asset(string $asset): string
+    function lara_gen_adv_asset(string $asset): string
     {
-        $file = laravel_generator_dist_path($asset);
+        $file = lara_gen_adv_dist_path($asset);
 
         if (!file_exists($file)) {
             throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator asset does not exist', $asset));
@@ -46,11 +46,11 @@ function laravel_generator_asset(string $asset): string
 
         $useAbsolutePath = config('lara-gen-adv.defaults.paths.use_absolute_path');
 
-        return route('laravel_generator.asset', ['asset' => $asset], $useAbsolutePath).'?v='.filemtime($file);
+        return route('lara_gen_adv.asset', ['asset' => $asset], $useAbsolutePath);
     }
 }
 
-if (!function_exists('laravel_generator_dist_path_allowed')) {
+if (!function_exists('lara_gen_adv_dist_path_allowed')) {
     /**
      * Returns asset allowed from laravel-generator-advanced composer package.
      *
@@ -60,7 +60,7 @@ function laravel_generator_asset(string $asset): string
      *
      * @throws LaravelGeneratorAdvancedException
      */
-    function laravel_generator_asset_allowed(string $asset): string
+    function lara_gen_adv_asset_allowed(string $asset): string
     {
         $allowed_files = [
             'favicon-16x16.png',
@@ -68,9 +68,9 @@ function laravel_generator_asset_allowed(string $asset): string
         ];
 
         if (!in_array($asset, $allowed_files)) {
-            throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator asset is not allowed', $asset));
+            throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator Advanced asset is not allowed', $asset));
         }
 
-        return laravel_generator_asset($asset);
+        return lara_gen_adv_asset($asset);
     }
 }
diff --git a/config/laravel-generator-advanced.php b/config/laravel-generator-advanced.php
index 2d4c58f..909cc41 100644
--- a/config/laravel-generator-advanced.php
+++ b/config/laravel-generator-advanced.php
@@ -11,7 +11,7 @@
 
             'routes' => [
                 /* Route for laravel generator tool */
-                'tool' => env('TH_LARAVEL_GENERATOR_TOOL_ROUTE', 'laravel-generator-advanced'),
+                'tool' => env('LARA_GEN_ADV_TOOL_ROUTE', 'laravel-generator-advanced'),
             ],
         ],
     ],
@@ -19,7 +19,7 @@
     'defaults' => [
         'paths' => [
             /* Edit to include full URL in ui for assets */
-            'use_absolute_path' => env('TH_LARAVEL_GENERATOR_USE_ABSOLUTE_PATH', true),
+            'use_absolute_path' => env('LARA_GEN_ADV_USE_ABSOLUTE_PATH', true),
 
             'views' => base_path('resources/views/vendor/laravel-generator-advanced'),
 
@@ -27,8 +27,8 @@
 
             'assets_folder' => 'dist/',
 
-            'laravel_generator_assets_path' => env(
-                'TH_LARAVEL_GENERATOR_ASSETS_PATH',
+            'lara_gen_adv_assets_path' => env(
+                'LARA_GEN_ADV_ASSETS_PATH',
                 'vendor/cslant/laravel-generator-ui/dist/'
             ),
         ],
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 5ed08c6..daa5c2f 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -18,7 +18,7 @@
     <!-- Material Icons -->
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons+Round" rel="stylesheet">
     <!-- CSS Files --><!-- Nucleo Icons -->
-    <link id="pagestyle" href="{{ laravel_generator_asset('css/main.css') }}" rel="stylesheet"/>
+    <link href="{{ lara_gen_adv_asset('css/main.css') }}" rel="stylesheet"/>
 </head>
 
 <body class="g-sidenav-show bg-gray-200">
diff --git a/resources/views/shared/footer.blade.php b/resources/views/shared/footer.blade.php
index 5ca969f..9b9f142 100644
--- a/resources/views/shared/footer.blade.php
+++ b/resources/views/shared/footer.blade.php
@@ -1,5 +1,5 @@
 <!--   Core JS Files   -->
-<script src="{{ laravel_generator_asset('js/main.js') }}"></script>
+<script src="{{ lara_gen_adv_asset('js/main.js') }}"></script>
 <script>
     const win = navigator.platform.indexOf('Win') > -1;
     if (win && document.querySelector('#sidenav-scrollbar')) {
@@ -9,6 +9,6 @@
         Scrollbar.init(document.querySelector('#sidenav-scrollbar'), options);
     }
 </script>
-<script src="{{ laravel_generator_asset('js/material-dashboard.min.js') }}"></script>
+<script src="{{ lara_gen_adv_asset('js/material-dashboard.min.js') }}"></script>
 
 </html>
diff --git a/routes/web.php b/routes/web.php
index 73e012e..1d9b839 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,13 +12,13 @@
     $generatorConfig = $configRepository->generatorConfig();
 
     Route::prefix($generatorConfig['routes']['tool'])->group(function (Router $router) {
-        Route::get('/', [LaravelGeneratorAdvancedController::class, 'index'])->name('laravel_generator.index');
+        Route::get('/', [LaravelGeneratorAdvancedController::class, 'index'])->name('lara_gen_adv.index');
 
         Route::get('asset/{asset}', [AssetController::class, 'index'])
-            ->name('laravel_generator.asset')
+            ->name('lara_gen_adv.asset')
             ->where('asset', '.*');
 
         Route::get('repository', [RepositoryGeneratorController::class, 'index'])
-            ->name('laravel_generator.repository.index');
+            ->name('lara_gen_adv.repository.index');
     });
 });
diff --git a/src/Http/Controllers/Asset/AssetController.php b/src/Http/Controllers/Asset/AssetController.php
index d2ce411..8e57db9 100644
--- a/src/Http/Controllers/Asset/AssetController.php
+++ b/src/Http/Controllers/Asset/AssetController.php
@@ -21,7 +21,7 @@ public function index(Request $request): string
         $asset = $request->offsetGet('asset');
 
         try {
-            $path = laravel_generator_dist_path($asset);
+            $path = lara_gen_adv_dist_path($asset);
 
             return (new Response(
                 $fileSystem->get($path),

From 497360dd1dfcbed29cb2aeabb3d007432758a86d Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Wed, 10 Jan 2024 11:21:50 +0700
Subject: [PATCH 3/3] fix: return type for get asset files action

---
 common/helpers.php                             |  2 +-
 src/Http/Controllers/Asset/AssetController.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/helpers.php b/common/helpers.php
index eec03f4..a05e250 100644
--- 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
index 8e57db9..d5b13e4 100644
--- 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);
         }
     }
 }