updated styles and cs-fixer

.php_cs.dist → .php-cs-fixer.dist.php

@@ -1,25 +1,18 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__)
-    ->exclude([
-        'vendor',
-        'tests/Commands/__snapshots__',
-    ])
-;
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
 
-return PhpCsFixer\Config::create()
-    ->setFinder($finder)
-    ->setRules([
-        '@PSR2' => true,
+$rules = [
+    '@PSR12' => true,
         // Concatenation should be used with at least one whitespace around.
         'concat_space' => ['spacing' => 'one'],
         // Unused use statements must be removed.
         'ordered_imports' => true,
         // Removes extra empty lines.
-        'no_extra_consecutive_blank_lines' => true,
+        'no_extra_blank_lines' => true,
         // An empty line feed should precede a return statement.
-        'blank_line_before_return' => true,
+        'blank_line_before_statement' => true,
         // Unused use statements must be removed.
         'no_unused_imports' => true,
         // Remove trailing whitespace at the end of blank lines.
@@ -35,12 +28,26 @@
         // Remove duplicated semicolons.
         'no_empty_statement' => true,
         // PHP multi-line arrays should have a trailing comma.
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         // There should be no empty lines after class opening brace.
         'no_blank_lines_after_class_opening' => true,
         // There should not be blank lines between docblock and the documented element.
         'no_blank_lines_after_phpdoc' => true,
         // Phpdocs should start and end with content, excluding the very first and last line of the docblocks.
         'phpdoc_trim' => true,
+];
+
+$finder = Finder::create()
+    ->in(__DIR__)
+    ->exclude([
+        'vendor',
+        'tests/Commands/__snapshots__',
     ])
-;
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+return (new Config())
+    ->setFinder($finder)
+    ->setRules($rules)
+    ->setRiskyAllowed(true)
+    ->setUsingCache(true);

src/Commands/CommandMakeCommand.php

@@ -34,7 +34,7 @@ class CommandMakeCommand extends GeneratorCommand
      */
     protected $description = 'Generate new Artisan command for the specified module.';
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/ComponentClassMakeCommand.php

@@ -33,7 +33,7 @@ class ComponentClassMakeCommand extends GeneratorCommand
      */
     protected $description = 'Create a new component-class for the specified module.';
 
-    public function handle() : int
+    public function handle(): int
     {
         if (parent::handle() === E_ERROR) {
             return E_ERROR;
@@ -52,7 +52,7 @@ protected function writeComponentViewTemplate()
         $this->call('module:make-component-view', ['name' => $this->argument('name') , 'module' => $this->argument('module')]);
     }
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/ControllerMakeCommand.php

@@ -115,7 +115,7 @@ private function getControllerNameWithoutNamespace()
         return class_basename($this->getControllerName());
     }
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/DisableCommand.php

@@ -25,7 +25,7 @@ class DisableCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         /**
          * check if user entred an argument

src/Commands/DumpCommand.php

@@ -24,7 +24,7 @@ class DumpCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         $this->info('Generating optimized autoload modules.');
 

src/Commands/EnableCommand.php

@@ -25,7 +25,7 @@ class EnableCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         /**
          * check if user entred an argument

src/Commands/EventMakeCommand.php

@@ -55,7 +55,7 @@ protected function getFileName()
         return Str::studly($this->argument('name'));
     }
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/GeneratorCommand.php

@@ -32,7 +32,7 @@ abstract protected function getDestinationFilePath();
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         $path = str_replace('\\', '/', $this->getDestinationFilePath());
 
@@ -71,7 +71,7 @@ public function getClass()
      *
      * @return string
      */
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         return '';
     }

src/Commands/InstallCommand.php

@@ -35,7 +35,7 @@ public function __construct()
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         if (is_null($this->argument('name'))) {
             return $this->installFromFile();
@@ -54,7 +54,7 @@ public function handle() : int
     /**
      * Install modules from modules.json file.
      */
-    protected function installFromFile() : int
+    protected function installFromFile(): int
     {
         if (!file_exists($path = base_path('modules.json'))) {
             $this->error("File 'modules.json' does not exist in your project root.");

src/Commands/JobMakeCommand.php

@@ -29,7 +29,7 @@ class JobMakeCommand extends GeneratorCommand
 
     protected $argumentName = 'name';
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/LaravelModulesV6Migrator.php

@@ -13,7 +13,7 @@ class LaravelModulesV6Migrator extends Command
     protected $name = 'module:v6:migrate';
     protected $description = 'Migrate laravel-modules v5 modules statuses to v6.';
 
-    public function handle() : int
+    public function handle(): int
     {
         $moduleStatuses = [];
         /** @var RepositoryInterface $modules */

src/Commands/ListCommand.php

@@ -25,7 +25,7 @@ class ListCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         $this->table(['Name', 'Status', 'Priority', 'Path'], $this->getRows());
 
@@ -59,18 +59,22 @@ public function getModules()
         switch ($this->option('only')) {
             case 'enabled':
                 return $this->laravel['modules']->getByStatus(1);
+
                 break;
 
             case 'disabled':
                 return $this->laravel['modules']->getByStatus(0);
+
                 break;
 
             case 'priority':
                 return $this->laravel['modules']->getPriority($this->option('direction'));
+
                 break;
 
             default:
                 return $this->laravel['modules']->all();
+
                 break;
         }
     }

src/Commands/ListenerMakeCommand.php

@@ -68,7 +68,7 @@ protected function getTemplateContents()
         ]))->render();
     }
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/MailMakeCommand.php

@@ -28,7 +28,7 @@ class MailMakeCommand extends GeneratorCommand
 
     protected $argumentName = 'name';
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/MiddlewareMakeCommand.php

@@ -33,7 +33,7 @@ class MiddlewareMakeCommand extends GeneratorCommand
      */
     protected $description = 'Create a new middleware class for the specified module.';
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/MigrateCommand.php

@@ -34,7 +34,7 @@ class MigrateCommand extends Command
      *
      * @return mixed
      */
-    public function handle() : int
+    public function handle(): int
     {
         $this->module = $this->laravel['modules'];
 

src/Commands/MigrateFreshCommand.php

@@ -28,7 +28,7 @@ class MigrateFreshCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         $module = $this->argument('module');
 

src/Commands/MigrateRefreshCommand.php

@@ -28,7 +28,7 @@ class MigrateRefreshCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         $module = $this->argument('module');
 

src/Commands/MigrateResetCommand.php

@@ -34,7 +34,7 @@ class MigrateResetCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         $this->module = $this->laravel['modules'];
 

src/Commands/MigrateRollbackCommand.php

@@ -34,7 +34,7 @@ class MigrateRollbackCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         $this->module = $this->laravel['modules'];
 

src/Commands/MigrateStatusCommand.php

@@ -34,7 +34,7 @@ class MigrateStatusCommand extends Command
      *
      * @return mixed
      */
-    public function handle() : int
+    public function handle(): int
     {
         $this->module = $this->laravel['modules'];
 

src/Commands/MigrationMakeCommand.php

@@ -151,7 +151,7 @@ public function getClass()
     /**
      * Run the command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         if (parent::handle() === E_ERROR) {
             return E_ERROR;

src/Commands/ModelMakeCommand.php

@@ -34,7 +34,7 @@ class ModelMakeCommand extends GeneratorCommand
      */
     protected $description = 'Create a new model for the specified module.';
 
-    public function handle() : int
+    public function handle(): int
     {
         if (parent::handle() === E_ERROR) {
             return E_ERROR;
@@ -116,7 +116,7 @@ private function handleOptionalControllerOption()
 
             $this->call('module:make-controller', array_filter([
                 'controller' => $controllerName,
-                'module' => $this->argument('module')
+                'module' => $this->argument('module'),
             ]));
         }
     }
@@ -181,7 +181,7 @@ private function getFillable()
      *
      * @return string
      */
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/ModuleDeleteCommand.php

@@ -10,7 +10,7 @@ class ModuleDeleteCommand extends Command
     protected $name = 'module:delete';
     protected $description = 'Delete a module from the application';
 
-    public function handle() : int
+    public function handle(): int
     {
         $this->laravel['modules']->delete($this->argument('module'));
 

src/Commands/ModuleMakeCommand.php

@@ -27,7 +27,7 @@ class ModuleMakeCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         $names = $this->argument('name');
         $success = true;

src/Commands/NotificationMakeCommand.php

@@ -28,7 +28,7 @@ final class NotificationMakeCommand extends GeneratorCommand
      */
     protected $description = 'Create a new notification class for the specified module.';
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/PolicyMakeCommand.php

@@ -33,7 +33,7 @@ class PolicyMakeCommand extends GeneratorCommand
      */
     protected $description = 'Create a new policy class for the specified module.';
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/ProviderMakeCommand.php

@@ -35,7 +35,7 @@ class ProviderMakeCommand extends GeneratorCommand
      */
     protected $description = 'Create a new service provider class for the specified module.';
 
-    public function getDefaultNamespace() : string
+    public function getDefaultNamespace(): string
     {
         $module = $this->laravel['modules'];
 

src/Commands/PublishCommand.php

@@ -26,7 +26,7 @@ class PublishCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         if ($name = $this->argument('module')) {
             $this->publish($name);

src/Commands/PublishConfigurationCommand.php

@@ -26,7 +26,7 @@ class PublishConfigurationCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle() : int
+    public function handle(): int
     {
         if ($module = $this->argument('module')) {
             $this->publishConfiguration($module);