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
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 @@
'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 @@
'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 @@
'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 @@
'Laravel Generator',
+ 'tool_name' => 'Laravel Generator',
'dashboard' => 'Laravel Generator Dashboard',
];
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/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 @@
- @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')))
- {{ __('lara-gen-adv::generator.app_name') }}
+ {{ __('lara-gen-adv::generator.tool_name') }}
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 @@
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 @@
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 @@
-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;
- }
-}
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',
]