From 65660b5f093be5725de6c46dda5f0c8328331ac3 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Thu, 11 Jan 2024 03:07:32 +0700
Subject: [PATCH 1/3] refactor: prefix route and config

---
 config/laravel-generator-advanced.php     | 17 +-----
 lang/en/generator.php                     |  2 +-
 lang/ja/generator.php                     |  2 +-
 lang/vi/generator.php                     |  2 +-
 resources/views/layouts/app.blade.php     |  2 +-
 resources/views/shared/left_bar.blade.php |  2 +-
 resources/views/shared/navbar.blade.php   |  4 +-
 routes/web.php                            | 20 +++----
 src/Helpers/ConfigHelper.php              | 71 -----------------------
 9 files changed, 17 insertions(+), 105 deletions(-)
 delete mode 100644 src/Helpers/ConfigHelper.php

diff --git a/config/laravel-generator-advanced.php b/config/laravel-generator-advanced.php
index 909cc41..fa3d0be 100644
--- a/config/laravel-generator-advanced.php
+++ b/config/laravel-generator-advanced.php
@@ -1,22 +1,11 @@
 <?php
 
 return [
-    'default' => 'default',
-
-    'app_name' => 'Laravel Generator Advanced',
-
-    'generators' => [
-        'default' => [
-            'path' => 'app',
-
-            'routes' => [
-                /* Route for laravel generator tool */
-                'tool' => env('LARA_GEN_ADV_TOOL_ROUTE', 'laravel-generator-advanced'),
-            ],
-        ],
-    ],
+    'tool_name' => 'Laravel Generator Advanced',
 
     'defaults' => [
+        'route_prefix' => env('LARA_GEN_ADV_ROUTE_PREFIX', 'laravel-generator-advanced'),
+
         'paths' => [
             /* Edit to include full URL in ui for assets */
             'use_absolute_path' => env('LARA_GEN_ADV_USE_ABSOLUTE_PATH', true),
diff --git a/lang/en/generator.php b/lang/en/generator.php
index 39f84b4..dbd4b25 100644
--- a/lang/en/generator.php
+++ b/lang/en/generator.php
@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'app_name' => 'Laravel Generator Advanced',
+    'tool_name' => 'Laravel Generator Advanced',
     'dashboard' => 'Laravel Generator Advanced Dashboard',
 ];
diff --git a/lang/ja/generator.php b/lang/ja/generator.php
index 087d7e1..fb0929f 100644
--- a/lang/ja/generator.php
+++ b/lang/ja/generator.php
@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'app_name' => 'Laravel ジェネレーター',
+    'tool_name' => 'Laravel ジェネレーター',
     'dashboard' => 'Laravel ジェネレーター ダッシュボード',
 ];
diff --git a/lang/vi/generator.php b/lang/vi/generator.php
index d491e67..916123b 100644
--- a/lang/vi/generator.php
+++ b/lang/vi/generator.php
@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'app_name' => 'Laravel Generator',
+    'tool_name' => 'Laravel Generator',
     'dashboard' => 'Laravel Generator Dashboard',
 ];
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index daa5c2f..2695a2c 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('lara-gen-adv.app_name', __('lara-gen-adv::generator.app_name')))
+        @yield('title', config('lara-gen-adv.tool_name', __('lara-gen-adv::generator.tool_name')))
     </title>
     <!-- Fonts and icons -->
     <link rel="stylesheet" type="text/css"
diff --git a/resources/views/shared/left_bar.blade.php b/resources/views/shared/left_bar.blade.php
index 2735489..357da58 100644
--- a/resources/views/shared/left_bar.blade.php
+++ b/resources/views/shared/left_bar.blade.php
@@ -3,7 +3,7 @@
         <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-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">{{ __('lara-gen-adv::generator.app_name') }}</span>
+            <span class="ms-1 font-weight-bold text-white">{{ __('lara-gen-adv::generator.tool_name') }}</span>
         </a>
     </div>
     <hr class="horizontal light mt-0 mb-2">
diff --git a/resources/views/shared/navbar.blade.php b/resources/views/shared/navbar.blade.php
index 16e3181..1afe7f9 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('lara-gen-adv.app_name') }}</a>
+                    <a class="opacity-5 text-dark" href="javascript:void(0);">{{ config('lara-gen-adv.tool_name') }}</a>
                 </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>
+                <li class="breadcrumb-item text-sm text-dark active" aria-current="page">@yield('title', config('lara-gen-adv.tool_name', __('lara-gen-adv::generator.tool_name')))</li>
             </ol>
         </nav>
         <div class="collapse navbar-collapse mt-sm-0 mt-2 me-md-0 me-sm-4" id="navbar">
diff --git a/routes/web.php b/routes/web.php
index 1d9b839..62d7b8a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,24 +1,18 @@
 <?php
 
-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\LaraGenAdv\Http\Controllers')->group(function () {
-    $configRepository = resolve(ConfigHelper::class);
-    $generatorConfig = $configRepository->generatorConfig();
+$routePrefix = config('lara-gen-adv.defaults.route_prefix');
 
-    Route::prefix($generatorConfig['routes']['tool'])->group(function (Router $router) {
-        Route::get('/', [LaravelGeneratorAdvancedController::class, 'index'])->name('lara_gen_adv.index');
+Route::prefix($routePrefix)->group(function () {
+    Route::get('/', [LaravelGeneratorAdvancedController::class, 'index'])->name('lara_gen_adv.index');
 
-        Route::get('asset/{asset}', [AssetController::class, 'index'])
-            ->name('lara_gen_adv.asset')
-            ->where('asset', '.*');
+    Route::get('asset/{asset}', [AssetController::class, 'index'])
+        ->name('lara_gen_adv.asset')
+        ->where('asset', '.*');
 
-        Route::get('repository', [RepositoryGeneratorController::class, 'index'])
-            ->name('lara_gen_adv.repository.index');
-    });
+    Route::get('repository', [RepositoryGeneratorController::class, 'index'])->name('lara_gen_adv.repository.index');
 });
diff --git a/src/Helpers/ConfigHelper.php b/src/Helpers/ConfigHelper.php
deleted file mode 100644
index cdbf07f..0000000
--- a/src/Helpers/ConfigHelper.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace CSlant\LaraGenAdv\Helpers;
-
-use CSlant\LaraGenAdv\Exceptions\LaravelGeneratorAdvancedException;
-
-class ConfigHelper
-{
-    /**
-     * Get config.
-     *
-     * @param  string|null  $generatorName
-     *
-     * @return array
-     *
-     * @throws LaravelGeneratorAdvancedException
-     */
-    public function generatorConfig(?string $generatorName = null): array
-    {
-        if ($generatorName === null) {
-            $generatorName = config('lara-gen-adv.default');
-        }
-
-        $defaults = config('lara-gen-adv.defaults', []);
-        $generators = config('lara-gen-adv.generators', []);
-
-        if (!isset($generators[$generatorName])) {
-            throw new LaravelGeneratorAdvancedException('Generator name not found');
-        }
-
-        return $this->mergeConfig($defaults, $generators[$generatorName]);
-    }
-
-    /**
-     * Merge config.
-     *
-     * @param  array  $defaults
-     * @param  array  $generatorName
-     * @return array
-     */
-    private function mergeConfig(array $defaults, array $generatorName): array
-    {
-        $merged = $defaults;
-
-        foreach ($generatorName as $key => &$value) {
-            if (isset($defaults[$key])
-                && $this->isAssociativeArray($defaults[$key])
-                && $this->isAssociativeArray($value)
-            ) {
-                $merged[$key] = $this->mergeConfig($defaults[$key], $value);
-
-                continue;
-            }
-
-            $merged[$key] = $value;
-        }
-
-        return $merged;
-    }
-
-    /**
-     * Check is associative key array.
-     *
-     * @param  mixed  $key
-     * @return bool
-     */
-    private function isAssociativeArray(mixed $key): bool
-    {
-        return is_array($key) && count(array_filter(array_keys($key), 'is_string')) > 0;
-    }
-}

From d7a86ed2cb176bc39e4d4ee98f30ab838f858cd5 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Thu, 11 Jan 2024 03:10:49 +0700
Subject: [PATCH 2/3] fix: some error in phpstan analyse

---
 phpstan-baseline.neon                          | 7 +++++++
 phpstan.neon.dist                              | 1 +
 src/Http/Controllers/Asset/AssetController.php | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e69de29..2eff73c 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -0,0 +1,7 @@
+parameters:
+    ignoreErrors:
+        - message: '#Parameter \#1 \$prefix of static method Illuminate\\Support\\Facades\\Route::prefix\(\) expects string, mixed given\.#'
+          path: routes/web.php
+
+        - message: '#Parameter \#1 \$asset of function lara_gen_adv_dist_path expects string\|null, mixed given#'
+          path: src/Http/Controllers/Asset/AssetController.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index dba5a52..f6d409c 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -10,3 +10,4 @@ parameters:
     checkOctaneCompatibility: true
     checkModelProperties: true
     checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
diff --git a/src/Http/Controllers/Asset/AssetController.php b/src/Http/Controllers/Asset/AssetController.php
index d5b13e4..808e641 100644
--- a/src/Http/Controllers/Asset/AssetController.php
+++ b/src/Http/Controllers/Asset/AssetController.php
@@ -28,7 +28,7 @@ public function index(Request $request): Response
                 $fileSystem->get($path),
                 200,
                 [
-                    'Content-Type' => pathinfo($asset, PATHINFO_EXTENSION) == 'css'
+                    'Content-Type' => pathinfo($path, PATHINFO_EXTENSION) == 'css'
                         ? 'text/css'
                         : 'application/javascript',
                 ]

From d8fe0241753783afa1e6f0989af7af5313b9973d Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Thu, 11 Jan 2024 03:23:28 +0700
Subject: [PATCH 3/3] chore: disable some check rule for styleci

---
 .styleci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.styleci.yml b/.styleci.yml
index 06256fb..1336d96 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -2,3 +2,5 @@ preset: laravel
 
 disabled:
   - not_operator_with_successor_space
+  - laravel_phpdoc_separation
+  - laravel_phpdoc_alignment