update format style

tanhongit · tanhongit · commit 787dcd85cd18 · 2023-04-25T23:40:39.000+07:00
diff --git a/.styleci.yml b/.styleci.yml
@@ -1 +1 @@
-preset: psr12
+preset: laravel
diff --git a/common/helpers.php b/common/helpers.php
@@ -6,20 +6,20 @@
     /**
      * Returns laravel-generator composer dist path.
      *
-     * @param string|null $asset string
+     * @param  string|null  $asset  string
      *
      * @return string
      */
     function laravel_generator_dist_path(string $asset = null): string
     {
-        $defaultPath = config('laravel-generator.defaults.paths.ui_package_path') . '/dist/';
+        $defaultPath = config('laravel-generator.defaults.paths.ui_package_path').'/dist/';
         $path = base_path(config('laravel-generator.defaults.paths.laravel_generator_assets_path', $defaultPath));
 
         if (!$asset) {
             return realpath($path);
         }
 
-        return realpath($path . $asset);
+        return realpath($path.$asset);
     }
 }
 
@@ -43,7 +43,7 @@ function laravel_generator_asset(string $asset): string
 
         $useAbsolutePath = config('laravel-generator.defaults.paths.use_absolute_path', true);
 
-        return route('laravel_generator.asset', ['asset' => $asset], $useAbsolutePath) . '?v=' . filemtime($file);
+        return route('laravel_generator.asset', ['asset' => $asset], $useAbsolutePath).'?v='.filemtime($file);
     }
 }
 
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -10,7 +10,8 @@
         @yield('title', config('laravel-generator.app_name', __('laravel-generator::generator.app_name')))
     </title>
     <!-- Fonts and icons -->
-    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,900|Roboto+Slab:400,700"/>
+    <link rel="stylesheet" type="text/css"
+          href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,900|Roboto+Slab:400,700"/>
 
     <!-- Font Awesome Icons -->
     <script src="https://kit.fontawesome.com/42d5adcbca.js" crossorigin="anonymous"></script>
@@ -21,17 +22,17 @@
 </head>
 
 <body class="g-sidenav-show bg-gray-200">
-    @include('laravel-generator::shared.left_bar')
+@include('laravel-generator::shared.left_bar')
 
-    <div class="main-content position-relative max-height-vh-100 h-100">
-        <!-- Navbar -->
-        @include('laravel-generator::shared.navbar')
-        <!-- End Navbar -->
+<div class="main-content position-relative max-height-vh-100 h-100">
+    <!-- Navbar -->
+    @include('laravel-generator::shared.navbar')
+    <!-- End Navbar -->
 
-        @yield('laravel-generator-content')
-    </div>
+    @yield('laravel-generator-content')
+</div>
 
-    @include('laravel-generator::shared.configurator_settings')
+@include('laravel-generator::shared.configurator_settings')
 
-    @include('laravel-generator::shared.footer')
-</body>
+@include('laravel-generator::shared.footer')
+</body>
diff --git a/src/Exceptions/LaravelGeneratorException.php b/src/Exceptions/LaravelGeneratorException.php
@@ -7,9 +7,9 @@
 class LaravelGeneratorException extends Exception
 {
     /**
-     * @param string $message
-     * @param int $code
-     * @param Exception|null $previous
+     * @param  string  $message
+     * @param  int  $code
+     * @param  Exception|null  $previous
      */
     public function __construct(string $message = '', int $code = 0, Exception $previous = null)
     {
diff --git a/src/Helpers/ConfigHelper.php b/src/Helpers/ConfigHelper.php
@@ -9,7 +9,7 @@ class ConfigHelper
     /**
      * Get config
      *
-     * @param string|null $generatorName
+     * @param  string|null  $generatorName
      *
      * @return array
      * @throws LaravelGeneratorException
@@ -33,8 +33,8 @@ public function generatorConfig(?string $generatorName = null): array
     /**
      * Merge config
      *
-     * @param array $defaults
-     * @param array $generatorName
+     * @param  array  $defaults
+     * @param  array  $generatorName
      *
      * @return array
      */
@@ -60,7 +60,7 @@ private function mergeConfig(array $defaults, array $generatorName): array
     /**
      * Check is associative key array
      *
-     * @param mixed $key
+     * @param  mixed  $key
      *
      * @return bool
      */
diff --git a/src/Http/Controllers/Asset/AssetController.php b/src/Http/Controllers/Asset/AssetController.php
@@ -12,7 +12,7 @@
 class AssetController extends BaseController
 {
     /**
-     * @param Request $request
+     * @param  Request  $request
      *
      * @return string
      */
diff --git a/src/Http/Controllers/Detect/DetectController.php b/src/Http/Controllers/Detect/DetectController.php
@@ -27,13 +27,13 @@ public function getClassFromFile($file)
         }
 
         $namespace = $matches[1];
-        $class = $namespace . '\\' . $matches[2];
+        $class = $namespace.'\\'.$matches[2];
 
         return class_exists($class) ? new ReflectionClass($class) : null;
     }
 
     /**
-     * @param ReflectionClass $class
+     * @param  ReflectionClass  $class
      *
      * @return bool
      */
@@ -51,7 +51,7 @@ private function dependsOnModels(ReflectionClass $class)
     /**
      * Check if the class implements the CRUD methods
      *
-     * @param ReflectionClass $class
+     * @param  ReflectionClass  $class
      *
      * @return bool
      */
@@ -80,7 +80,7 @@ protected function implementsCrudMethods(ReflectionClass $class)
      * and implement the CRUD methods
      * and have a dependency on a model
      *
-     * @param ReflectionClass $class
+     * @param  ReflectionClass  $class
      *
      * @return bool
      */
@@ -93,7 +93,7 @@ public function isRepositoryClass(ReflectionClass $class)
      * Check if the class is a service class
      * A service class must have a name ending with "Service" or "EloquentService"
      *
-     * @param ReflectionClass $class
+     * @param  ReflectionClass  $class
      *
      * @return bool
      */
@@ -108,7 +108,7 @@ public function isServiceClass(ReflectionClass $class)
      * and implement the CRUD methods
      * and have a dependency on a model
      *
-     * @param ReflectionClass $class
+     * @param  ReflectionClass  $class
      *
      * @return bool
      */
@@ -121,7 +121,7 @@ public function isControllerClass(ReflectionClass $class)
      * Check if the class is an action class
      * An action class must have a name ending with "Action" or "EloquentAction"
      *
-     * @param ReflectionClass $class
+     * @param  ReflectionClass  $class
      *
      * @return bool
      */
@@ -134,24 +134,24 @@ public function isActionClass(ReflectionClass $class)
      * Check if the class is a class of the given type
      * A class of the given type must have a name ending with the given type or "Eloquent" + the given type
      *
-     * @param ReflectionClass $class
+     * @param  ReflectionClass  $class
      * @param $type
      *
      * @return bool
      */
     protected function checkClassType(ReflectionClass $class, $type)
     {
         $type = ucfirst($type);
-        return preg_match('/' . $type . '$/', $class->getName()) === 1
-            || preg_match('/Eloquent' . $type . '$/', $class->getName()) === 1
+        return preg_match('/'.$type.'$/', $class->getName()) === 1
+            || preg_match('/Eloquent'.$type.'$/', $class->getName()) === 1
             && $this->implementsCrudMethods($class)
             && $this->dependsOnModels($class);
     }
 
     /**
      * Get the type of the given class
      *
-     * @param ReflectionClass $class
+     * @param  ReflectionClass  $class
      *
      * @return string
      */
diff --git a/src/Http/Controllers/Generator/GeneratorController.php b/src/Http/Controllers/Generator/GeneratorController.php
@@ -2,9 +2,7 @@
 
 namespace Lbil\LaravelGenerator\Http\Controllers\Generator;
 
-use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use Illuminate\Support\Facades\DB;
 
 class GeneratorController extends Controller
 {
diff --git a/src/Http/Controllers/Generator/RepositoryGeneratorController.php b/src/Http/Controllers/Generator/RepositoryGeneratorController.php
@@ -2,7 +2,7 @@
 
 namespace Lbil\LaravelGenerator\Http\Controllers\Generator;
 
-use Str;
+use Illuminate\Support\Str;
 use Lbil\LaravelGenerator\Http\Controllers\Detect\DetectController;
 use Lbil\LaravelGenerator\Http\Requests\Generator\RepositoryGeneratorRequest;
 
diff --git a/src/Http/Controllers/LaravelGeneratorController.php b/src/Http/Controllers/LaravelGeneratorController.php
@@ -12,7 +12,7 @@
 class LaravelGeneratorController extends Controller
 {
     /**
-     * @param Request $request
+     * @param  Request  $request
      *
      * @return Application|Factory|View
      */
diff --git a/tests/Unit/DetectTest.php b/tests/Unit/DetectTest.php
@@ -8,7 +8,7 @@
 
 class DetectTest extends TestCase
 {
-    protected $detectController;
+    protected DetectController|Mockery\LegacyMockInterface|Mockery\MockInterface $detectController;
 
     /**
      * @return void

Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,20 @@`
`6`	`6`	`/**`
`7`	`7`	`* Returns laravel-generator composer dist path.`
`8`	`8`	`*`
`9`		`- * @param string\|null $asset string`
	`9`	`+ * @param string\|null $asset string`
`10`	`10`	`*`
`11`	`11`	`* @return string`
`12`	`12`	`*/`
`13`	`13`	`function laravel_generator_dist_path(string $asset = null): string`
`14`	`14`	`{`
`15`		`- $defaultPath = config('laravel-generator.defaults.paths.ui_package_path') . '/dist/';`
	`15`	`+ $defaultPath = config('laravel-generator.defaults.paths.ui_package_path').'/dist/';`
`16`	`16`	`$path = base_path(config('laravel-generator.defaults.paths.laravel_generator_assets_path', $defaultPath));`
`17`	`17`
`18`	`18`	`if (!$asset) {`
`19`	`19`	`return realpath($path);`
`20`	`20`	`}`
`21`	`21`
`22`		`- return realpath($path . $asset);`
	`22`	`+ return realpath($path.$asset);`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`@@ -43,7 +43,7 @@ function laravel_generator_asset(string $asset): string`
`43`	`43`
`44`	`44`	`$useAbsolutePath = config('laravel-generator.defaults.paths.use_absolute_path', true);`
`45`	`45`
`46`		`- return route('laravel_generator.asset', ['asset' => $asset], $useAbsolutePath) . '?v=' . filemtime($file);`
	`46`	`+ return route('laravel_generator.asset', ['asset' => $asset], $useAbsolutePath).'?v='.filemtime($file);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`	`class LaravelGeneratorException extends Exception`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`		`- * @param string $message`
`11`		`- * @param int $code`
`12`		`- * @param Exception\|null $previous`
	`10`	`+ * @param string $message`
	`11`	`+ * @param int $code`
	`12`	`+ * @param Exception\|null $previous`
`13`	`13`	`*/`
`14`	`14`	`public function __construct(string $message = '', int $code = 0, Exception $previous = null)`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class ConfigHelper`
`9`	`9`	`/**`
`10`	`10`	`* Get config`
`11`	`11`	`*`
`12`		`- * @param string\|null $generatorName`
	`12`	`+ * @param string\|null $generatorName`
`13`	`13`	`*`
`14`	`14`	`* @return array`
`15`	`15`	`* @throws LaravelGeneratorException`
`@@ -33,8 +33,8 @@ public function generatorConfig(?string $generatorName = null): array`
`33`	`33`	`/**`
`34`	`34`	`* Merge config`
`35`	`35`	`*`
`36`		`- * @param array $defaults`
`37`		`- * @param array $generatorName`
	`36`	`+ * @param array $defaults`
	`37`	`+ * @param array $generatorName`
`38`	`38`	`*`
`39`	`39`	`* @return array`
`40`	`40`	`*/`
`@@ -60,7 +60,7 @@ private function mergeConfig(array $defaults, array $generatorName): array`
`60`	`60`	`/**`
`61`	`61`	`* Check is associative key array`
`62`	`62`	`*`
`63`		`- * @param mixed $key`
	`63`	`+ * @param mixed $key`
`64`	`64`	`*`
`65`	`65`	`* @return bool`
`66`	`66`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`class AssetController extends BaseController`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`		`- * @param Request $request`
	`15`	`+ * @param Request $request`
`16`	`16`	`*`
`17`	`17`	`* @return string`
`18`	`18`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ public function getClassFromFile($file)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`$namespace = $matches[1];`
`30`		`- $class = $namespace . '\\' . $matches[2];`
	`30`	`+ $class = $namespace.'\\'.$matches[2];`
`31`	`31`
`32`	`32`	`return class_exists($class) ? new ReflectionClass($class) : null;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * @param ReflectionClass $class`
	`36`	`+ * @param ReflectionClass $class`
`37`	`37`	`*`
`38`	`38`	`* @return bool`
`39`	`39`	`*/`
`@@ -51,7 +51,7 @@ private function dependsOnModels(ReflectionClass $class)`
`51`	`51`	`/**`
`52`	`52`	`* Check if the class implements the CRUD methods`
`53`	`53`	`*`
`54`		`- * @param ReflectionClass $class`
	`54`	`+ * @param ReflectionClass $class`
`55`	`55`	`*`
`56`	`56`	`* @return bool`
`57`	`57`	`*/`
`@@ -80,7 +80,7 @@ protected function implementsCrudMethods(ReflectionClass $class)`
`80`	`80`	`* and implement the CRUD methods`
`81`	`81`	`* and have a dependency on a model`
`82`	`82`	`*`
`83`		`- * @param ReflectionClass $class`
	`83`	`+ * @param ReflectionClass $class`
`84`	`84`	`*`
`85`	`85`	`* @return bool`
`86`	`86`	`*/`
`@@ -93,7 +93,7 @@ public function isRepositoryClass(ReflectionClass $class)`
`93`	`93`	`* Check if the class is a service class`
`94`	`94`	`* A service class must have a name ending with "Service" or "EloquentService"`
`95`	`95`	`*`
`96`		`- * @param ReflectionClass $class`
	`96`	`+ * @param ReflectionClass $class`
`97`	`97`	`*`
`98`	`98`	`* @return bool`
`99`	`99`	`*/`
`@@ -108,7 +108,7 @@ public function isServiceClass(ReflectionClass $class)`
`108`	`108`	`* and implement the CRUD methods`
`109`	`109`	`* and have a dependency on a model`
`110`	`110`	`*`
`111`		`- * @param ReflectionClass $class`
	`111`	`+ * @param ReflectionClass $class`
`112`	`112`	`*`
`113`	`113`	`* @return bool`
`114`	`114`	`*/`
`@@ -121,7 +121,7 @@ public function isControllerClass(ReflectionClass $class)`
`121`	`121`	`* Check if the class is an action class`
`122`	`122`	`* An action class must have a name ending with "Action" or "EloquentAction"`
`123`	`123`	`*`
`124`		`- * @param ReflectionClass $class`
	`124`	`+ * @param ReflectionClass $class`
`125`	`125`	`*`
`126`	`126`	`* @return bool`
`127`	`127`	`*/`
`@@ -134,24 +134,24 @@ public function isActionClass(ReflectionClass $class)`
`134`	`134`	`* Check if the class is a class of the given type`
`135`	`135`	`* A class of the given type must have a name ending with the given type or "Eloquent" + the given type`
`136`	`136`	`*`
`137`		`- * @param ReflectionClass $class`
	`137`	`+ * @param ReflectionClass $class`
`138`	`138`	`* @param $type`
`139`	`139`	`*`
`140`	`140`	`* @return bool`
`141`	`141`	`*/`
`142`	`142`	`protected function checkClassType(ReflectionClass $class, $type)`
`143`	`143`	`{`
`144`	`144`	`$type = ucfirst($type);`
`145`		`- return preg_match('/' . $type . '$/', $class->getName()) === 1`
`146`		`- \|\| preg_match('/Eloquent' . $type . '$/', $class->getName()) === 1`
	`145`	`+ return preg_match('/'.$type.'$/', $class->getName()) === 1`
	`146`	`+ \|\| preg_match('/Eloquent'.$type.'$/', $class->getName()) === 1`
`147`	`147`	`&& $this->implementsCrudMethods($class)`
`148`	`148`	`&& $this->dependsOnModels($class);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`/**`
`152`	`152`	`* Get the type of the given class`
`153`	`153`	`*`
`154`		`- * @param ReflectionClass $class`
	`154`	`+ * @param ReflectionClass $class`
`155`	`155`	`*`
`156`	`156`	`* @return string`
`157`	`157`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Lbil\LaravelGenerator\Http\Controllers\Generator;`
`4`	`4`
`5`		`-use Illuminate\Http\Request;`
`6`	`5`	`use Illuminate\Routing\Controller;`
`7`		`-use Illuminate\Support\Facades\DB;`
`8`	`6`
`9`	`7`	`class GeneratorController extends Controller`
`10`	`8`	`{`