webNeat / lumen-generators

src/Commands/ControllerCommand.php

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php namespace Wn\Generators\Commands;
 
 
-use InvalidArgumentException;
-
 class ControllerCommand extends BaseCommand {
 
 	const DEFAULT_PATH = "app/Http/Controllers";

Indentation +22 added lines, -22 removed lines

@@ -5,9 +5,9 @@ 
 
 class ControllerCommand extends BaseCommand {
 
-	const DEFAULT_PATH = "app/Http/Controllers";
+    const DEFAULT_PATH = "app/Http/Controllers";
 
-	protected $signature = 'wn:controller
+    protected $signature = 'wn:controller
         {model : Name of the model (with namespace if not App)}
 		{--path='.ControllerCommand::DEFAULT_PATH.' : where to store the controllers file.}
 		{--no-routes= : without routes}
@@ -16,28 +16,28 @@ 
         {--laravel : Use Laravel style route definitions}
     ';
 
-	protected $description = 'Generates RESTful controller using the RESTActions trait';
+    protected $description = 'Generates RESTful controller using the RESTActions trait';
 
     public function handle()
     {
-    	$model = $this->argument('model');
-    	$name = '';
-    	if(strrpos($model, "\\") === false){
-    		$name = $model;
-    		$model = "App\\" . $model;
-    	} else {
-    		$name = explode("\\", $model);
-    		$name = $name[count($name) - 1];
-    	}
+        $model = $this->argument('model');
+        $name = '';
+        if(strrpos($model, "\\") === false){
+            $name = $model;
+            $model = "App\\" . $model;
+        } else {
+            $name = explode("\\", $model);
+            $name = $name[count($name) - 1];
+        }
         $controller = ucwords(str_plural($name)) . 'Controller';
         $content = $this->getTemplate('controller')
-        	->with([
-        		'name' => $controller,
-        		'model' => $model,
-				'namespace' => $this->getNamespace(),
-				'use' => ($this->getNamespace() != $this->getDefaultNamespace()?'use '.$this->getDefaultNamespace().'\Controller;'.PHP_EOL.'use '.$this->getDefaultNamespace().'\RESTActions;'.PHP_EOL:'')
-        	])
-        	->get();
+            ->with([
+                'name' => $controller,
+                'model' => $model,
+                'namespace' => $this->getNamespace(),
+                'use' => ($this->getNamespace() != $this->getDefaultNamespace()?'use '.$this->getDefaultNamespace().'\Controller;'.PHP_EOL.'use '.$this->getDefaultNamespace().'\RESTActions;'.PHP_EOL:'')
+            ])
+            ->get();
 
         $this->save($content, "./{$this->option('path')}/{$controller}.php", "{$controller}");
 
@@ -61,8 +61,8 @@ 
         }
     }
 
-	protected function getDefaultNamespace() {
-		return $this->getNamespace(ControllerCommand::DEFAULT_PATH);
-	}
+    protected function getDefaultNamespace() {
+        return $this->getNamespace(ControllerCommand::DEFAULT_PATH);
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
 	protected $signature = 'wn:controller
         {model : Name of the model (with namespace if not App)}
-		{--path='.ControllerCommand::DEFAULT_PATH.' : where to store the controllers file.}
+		{--path='.ControllerCommand::DEFAULT_PATH . ' : where to store the controllers file.}
 		{--no-routes= : without routes}
         {--routes= : where to store the routes.}
         {--force= : override the existing files}
@@ -22,7 +22,7 @@ 
     {
     	$model = $this->argument('model');
     	$name = '';
-    	if(strrpos($model, "\\") === false){
+    	if (strrpos($model, "\\") === false) {
     		$name = $model;
     		$model = "App\\" . $model;
     	} else {
@@ -35,13 +35,13 @@ 
         		'name' => $controller,
         		'model' => $model,
 				'namespace' => $this->getNamespace(),
-				'use' => ($this->getNamespace() != $this->getDefaultNamespace()?'use '.$this->getDefaultNamespace().'\Controller;'.PHP_EOL.'use '.$this->getDefaultNamespace().'\RESTActions;'.PHP_EOL:'')
+				'use' => ($this->getNamespace() != $this->getDefaultNamespace() ? 'use ' . $this->getDefaultNamespace() . '\Controller;' . PHP_EOL . 'use ' . $this->getDefaultNamespace() . '\RESTActions;' . PHP_EOL : '')
         	])
         	->get();
 
         $this->save($content, "./{$this->option('path')}/{$controller}.php", "{$controller}");
 
-        if(! $this->option('no-routes')){
+        if (!$this->option('no-routes')) {
             $options = [
                 'resource' => snake_case($name, '-'),
                 '--controller' => $controller,

src/Commands/ResourceCommand.php

Doc Comments +6 added lines

@@ -168,6 +168,9 @@ 
 
     }
 
+    /**
+     * @param string $tag
+     */
     protected function fieldsHavingTag($tag)
     {
         return array_map(function($field){
@@ -199,6 +202,9 @@ 
         }, $this->fields);
     }
 
+    /**
+     * @return string
+     */
     protected function getBaseModel($path) {
         $index = strrpos($path, "\\");
         if($index) {

Spacing +17 added lines, -17 removed lines

@@ -74,9 +74,9 @@ 
             '--parsed' => true
         ]);
 
-        if (! $this->option('no-controller')) {
+        if (!$this->option('no-controller')) {
             // generating REST actions trait if doesn't exist
-            if(! $this->fs->exists('./app/Http/Controllers/RESTActions.php')){
+            if (!$this->fs->exists('./app/Http/Controllers/RESTActions.php')) {
                 $this->call('wn:controller:rest-actions');
             }
 
@@ -100,8 +100,8 @@ 
 
         // generating model factory
         $this->call('wn:factory', [
-            'model' => $this->getNamespace().'\\'.$modelName,
-            '--file' => './database/factories/'.str_plural($modelName).'.php',
+            'model' => $this->getNamespace() . '\\' . $modelName,
+            '--file' => './database/factories/' . str_plural($modelName) . '.php',
             '--fields' => $this->factoryFields(),
             '--force' => $this->option('force'),
             '--parsed' => true
@@ -117,10 +117,10 @@ 
     protected function parseFields()
     {
         $fields = $this->argument('fields');
-        if($this->option('parsed')){
+        if ($this->option('parsed')) {
             $this->fields = $fields;
         } else {
-            if(! $fields){
+            if (!$fields) {
                 $this->fields = [];
             } else {
                 $this->fields = $this->getArgumentParser('fields')
@@ -151,7 +151,7 @@ 
                     if ($name['nullable']) {
                         $return['schema'][] = ['name' => 'nullable', 'args' => []];
                     } else {
-                        $return['rules'] = 'required'.(!empty($return['rules'])?'|'.$return['rules']:'');
+                        $return['rules'] = 'required' . (!empty($return['rules']) ? '|' . $return['rules'] : '');
                     }
                 } else {
                     $return['schema'] = [
@@ -170,7 +170,7 @@ 
 
     protected function fieldsHavingTag($tag)
     {
-        return array_map(function($field){
+        return array_map(function($field) {
             return $field['name'];
         }, array_filter($this->fields, function($field) use($tag){
             return in_array($tag, $field['tags']);
@@ -179,19 +179,19 @@ 
 
     protected function rules()
     {
-        return array_map(function($field){
+        return array_map(function($field) {
             return [
                 'name' => $field['name'],
                 'rule' => $field['rules']
             ];
-        }, array_filter($this->fields, function($field){
+        }, array_filter($this->fields, function($field) {
             return !empty($field['rules']);
         }));
     }
 
     protected function schema()
     {
-        return array_map(function($field){
+        return array_map(function($field) {
             return array_merge([[
                 'name' => $field['name'],
                 'args' => []
@@ -201,7 +201,7 @@ 
 
     protected function getBaseModel($path) {
         $index = strrpos($path, "\\");
-        if($index) {
+        if ($index) {
             return substr($path, $index + 1);
         }
         return $path;
@@ -212,19 +212,19 @@ 
         $belongsTo = $this->option('belongs-to');
         $morphTo = $this->option('morph-to');
 
-        if(! $belongsTo && (! $withMorph || ! $morphTo)) {
+        if (!$belongsTo && (!$withMorph || !$morphTo)) {
             return [];
         }
 
         $belongsTo = $belongsTo ? $this->getArgumentParser('relations')->parse($belongsTo) : [];
 
-        $belongsTo = array_map(function($relation){
+        $belongsTo = array_map(function($relation) {
             return array("model" => camel_case(str_singular($this->getBaseModel($relation['model'] ? $relation['model'] : $relation['name']))), "name" => snake_case(str_singular($this->getBaseModel($relation['name']))) . '_id', "type" => "belongsTo");
         }, $belongsTo);
 
         if ($withMorph) {
             $morphTo = $morphTo ? $this->getArgumentParser('relations-morphTo')->parse($morphTo) : [];
-            $morphTo = array_map(function($relation){
+            $morphTo = array_map(function($relation) {
                 $name = snake_case(str_singular($relation['name']));
                 return array(array("name" => $name . '_id', "type" => "morphTo", "nullable" => $relation['nullable']), array("name" => $name . '_type', "type" => "morphTo", "nullable" => $relation['nullable']));
             }, $morphTo);
@@ -253,12 +253,12 @@ 
 
     protected function factoryFields()
     {
-        return array_map(function($field){
+        return array_map(function($field) {
             return [
                 'name' => $field['name'],
                 'type' => $field['factory']
             ];
-        }, array_filter($this->fields, function($field){
+        }, array_filter($this->fields, function($field) {
             return isset($field['factory']) && $field['factory'];
         }));
     }

src/Commands/ResourcesCommand.php

Doc Comments +16 added lines

@@ -291,6 +291,10 @@ 
         return $string;
     }
 
+    /**
+     * @param string $old
+     * @param string $new
+     */
     protected function convertArray($list, $old, $new)
     {
         return implode($new, array_filter(explode($old, $list), function($item){
@@ -355,11 +359,17 @@ 
         return array(array(), $seen);//, array($item)
     }
 
+    /**
+     * @param string $message
+     */
     protected function checkError($message, $model = "", $file = "") {
         $this->checkErrors[] = array("message" => $message, "model" => $model, "file" => $file);
         $this->checkedErrors++;
     }
 
+    /**
+     * @param string $message
+     */
     protected function checkInfo($message, $model = "", $file = "") {
         $this->checkInfo[] = array("message" => $message, "model" => $model, "file" => $file);
     }
@@ -373,6 +383,9 @@ 
         }
     }
 
+    /**
+     * @param string $type
+     */
     protected function checkRelations($relations, $type, $file, $model, $keys) {
         if ($relations) {
             $position = array_search($model, $keys);
@@ -395,6 +408,9 @@ 
         }
     }
 
+    /**
+     * @param string $rType
+     */
     protected function checkPivotRelations($relations, $rType) {
         if ($relations) {
             foreach($relations as $relation) {

Indentation +131 added lines, -131 removed lines

@@ -36,32 +36,32 @@ 
         $files = $this->argument('files');
         $this->nodes = [];
         foreach ($files as $file) {
-        	$this->info("Reading file ".$file);
+            $this->info("Reading file ".$file);
 
-        	$content = $this->fs->get($file);
-        	$content = Yaml::parse($content);
+            $content = $this->fs->get($file);
+            $content = Yaml::parse($content);
 
-        	foreach ($content as $model => $i){
-        		/*
+            foreach ($content as $model => $i){
+                /*
         			$i['modelname'] = as originally in YAML defined
         			$i['name']      = as originally defined in snake_case
         			$i['uniquename']= for key in singular studly_case
         		*/
-        		$i['filename'] = $file;
-        		$i['modelname'] = $model;
-        		$model = studly_case(str_singular($model));
-        		$i['uniquename'] = $model;
-
-        		if (empty($this->nodes[$model]) || $this->option('force-redefine')) {
-        			if (!empty($this->nodes[$model])) {
-        				$this->checkError($model . ": forced to redefine (in file " . $this->nodes[$model]['filename'] . ", redefined from file ".$file.")");
-        			}
-        			$i = $this->getResourceParams($i);
-        			$this->nodes[$model] = $i;
-        		} else {
-        			$this->checkError($model . ": already defined (in file " . $this->nodes[$model]['filename'] . ", trying to redefine from file ".$file."; Use --force-redefine to force redefinition)");
-        		}
-        	}
+                $i['filename'] = $file;
+                $i['modelname'] = $model;
+                $model = studly_case(str_singular($model));
+                $i['uniquename'] = $model;
+
+                if (empty($this->nodes[$model]) || $this->option('force-redefine')) {
+                    if (!empty($this->nodes[$model])) {
+                        $this->checkError($model . ": forced to redefine (in file " . $this->nodes[$model]['filename'] . ", redefined from file ".$file.")");
+                    }
+                    $i = $this->getResourceParams($i);
+                    $this->nodes[$model] = $i;
+                } else {
+                    $this->checkError($model . ": already defined (in file " . $this->nodes[$model]['filename'] . ", trying to redefine from file ".$file."; Use --force-redefine to force redefinition)");
+                }
+            }
         }
 
         $this->line('');
@@ -70,123 +70,123 @@ 
         $this->nodes = $this->sortDependencies();
 
         if (! $this->option('skip-check')) {
-        	$this->info('Checking Relationships...');
-        	$keys = array_keys($this->nodes);
-        	foreach ($this->nodes as $model => $i) {
-        		$this->checkRelations($i['belongsTo'], 'belongsTo', $i['filename'], $i['uniquename'], $keys);
-        		// $this->checkRelations($i['hasManyThrough'], 'hasManyThrough', $file, $model);
-        	}
-        	$this->checkPivotRelations($this->pivotTables, 'pivot');
-        	$this->checkPivotRelations($this->morphTables, 'morph');
+            $this->info('Checking Relationships...');
+            $keys = array_keys($this->nodes);
+            foreach ($this->nodes as $model => $i) {
+                $this->checkRelations($i['belongsTo'], 'belongsTo', $i['filename'], $i['uniquename'], $keys);
+                // $this->checkRelations($i['hasManyThrough'], 'hasManyThrough', $file, $model);
+            }
+            $this->checkPivotRelations($this->pivotTables, 'pivot');
+            $this->checkPivotRelations($this->morphTables, 'morph');
         }
 
         if ($this->checkedErrors > 0) {
-        	$this->line('');
-        	if ($this->option('check-only')) {
-        		$this->info('Checking only, we have found ' . $this->checkedErrors . ' errors.');
-        	}
-        	$this->printErrors();
+            $this->line('');
+            if ($this->option('check-only')) {
+                $this->info('Checking only, we have found ' . $this->checkedErrors . ' errors.');
+            }
+            $this->printErrors();
         }
 
         $proceed = (! $this->option('check-only') && $this->checkedErrors == 0) || $this->option('skip-check');
         if (! $this->option('check-only') && $this->checkedErrors > 0) {
-        	$this->line('');
-        	$proceed = $this->confirm("We have found " . $this->checkedErrors . " errors. Are you sure you want to continue?");
+            $this->line('');
+            $proceed = $this->confirm("We have found " . $this->checkedErrors . " errors. Are you sure you want to continue?");
         }
         if ($proceed) {
-        	$modelIndex = 0;
+            $modelIndex = 0;
             $migrationIdLength = strlen((string)count($this->nodes));
-        	foreach ($this->nodes as $i) {
-        		$migrationName = 'Create' .  ucwords(str_plural($i['name']));
-        		$migrationFile = date('Y_m_d_His') . '-' . str_pad($modelIndex , $migrationIdLength, 0, STR_PAD_LEFT) . '_' . snake_case($migrationName) . '_table';
-
-        		$this->line('');
-        		$this->info('Building Model ' . $i['uniquename']);
-
-        		$options = [
-        			'name' => $i['name'],
-        			'fields' => $i['fields'],
-        			'--add' => $i['add'],
-        			'--has-many' => $i['hasMany'],
-        			'--has-one' => $i['hasOne'],
-        			'--belongs-to' => $i['belongsTo'],
-        			'--belongs-to-many' => $i['belongsToMany'],
-        			'--has-many-through' => $i['hasManyThrough'],
-        			'--morph-to' => $i['morphTo'],
-        			'--morph-many' => $i['morphMany'],
-        			'--morph-to-many' => $i['morphToMany'],
-        			'--morphed-by-many' => $i['morphedByMany'],
-        			'--no-routes' => $this->option('no-routes'),
-        			'--no-controller' => $this->option('no-controllers'),
-        			'--force' => $this->option('force'),
-        			'--migration-file' => $migrationFile,
-        		];
-        		if ($this->option('laravel')) {
-        			$options['--laravel'] = true;
-        		}
-        		if ($this->option('routes')) {
-        			$options['--routes'] = $this->option('routes');
-        		}
-        		if ($this->option('controllers')) {
-        			$options['--controller'] = $this->option('controllers');
-        		}
-        		if ($this->option('path')) {
-        			$options['--path'] = $this->option('path');
-        		}
-
-        		$this->call('wn:resource', $options);
-        		$modelIndex++;
-        	}
-
-        	// if (!$this->option('no-migration')) {
-        	// 	$this->call('migrate'); // actually needed for pivot seeders !
-        	// }
-
-        	$this->pivotTables = array_map(
-        		'unserialize',
-        		array_unique(array_map('serialize', $this->pivotTables))
-        	);
-
-        	$this->line('');
-        	foreach ($this->pivotTables as $tables) {
-        		$this->info('Building Pivot-Table ' . $tables[0] . ' - ' . $tables[1]);
-        		$this->call('wn:pivot-table', [
-        			'model1' => $tables[0],
-        			'model2' => $tables[1],
-        			'--force' => $this->option('force')
-        		]);
-
-        		// $this->call('wn:pivot-seeder', [
-        		//     'model1' => $tables[0],
-        		//     'model2' => $tables[1],
-        		//     '--force' => $this->option('force')
-        		// ]);
-        	}
-
-        	$this->morphTables = array_map(
-        		'unserialize',
-        		array_unique(array_map('serialize', $this->morphTables))
-        	);
-
-        	$this->line('');
-        	foreach ($this->morphTables as $tables) {
-        		$this->info('Building Morph-Table ' . $tables[0] . ' - ' . $tables[1]);
-        		$this->call('wn:morph-table', [
-        			'model' => $tables[0],
-        			'morphable' => $tables[1],
-        			'--force' => $this->option('force')
-        		]);
-
-        		// $this->call('wn:pivot-seeder', [
-        		//     'model1' => $tables[0],
-        		//     'model2' => $tables[1],
-        		//     '--force' => $this->option('force')
-        		// ]);
-        	}
-
-        	if (!$this->option('no-migration')) {
-        		$this->call('migrate');
-        	}
+            foreach ($this->nodes as $i) {
+                $migrationName = 'Create' .  ucwords(str_plural($i['name']));
+                $migrationFile = date('Y_m_d_His') . '-' . str_pad($modelIndex , $migrationIdLength, 0, STR_PAD_LEFT) . '_' . snake_case($migrationName) . '_table';
+
+                $this->line('');
+                $this->info('Building Model ' . $i['uniquename']);
+
+                $options = [
+                    'name' => $i['name'],
+                    'fields' => $i['fields'],
+                    '--add' => $i['add'],
+                    '--has-many' => $i['hasMany'],
+                    '--has-one' => $i['hasOne'],
+                    '--belongs-to' => $i['belongsTo'],
+                    '--belongs-to-many' => $i['belongsToMany'],
+                    '--has-many-through' => $i['hasManyThrough'],
+                    '--morph-to' => $i['morphTo'],
+                    '--morph-many' => $i['morphMany'],
+                    '--morph-to-many' => $i['morphToMany'],
+                    '--morphed-by-many' => $i['morphedByMany'],
+                    '--no-routes' => $this->option('no-routes'),
+                    '--no-controller' => $this->option('no-controllers'),
+                    '--force' => $this->option('force'),
+                    '--migration-file' => $migrationFile,
+                ];
+                if ($this->option('laravel')) {
+                    $options['--laravel'] = true;
+                }
+                if ($this->option('routes')) {
+                    $options['--routes'] = $this->option('routes');
+                }
+                if ($this->option('controllers')) {
+                    $options['--controller'] = $this->option('controllers');
+                }
+                if ($this->option('path')) {
+                    $options['--path'] = $this->option('path');
+                }
+
+                $this->call('wn:resource', $options);
+                $modelIndex++;
+            }
+
+            // if (!$this->option('no-migration')) {
+            // 	$this->call('migrate'); // actually needed for pivot seeders !
+            // }
+
+            $this->pivotTables = array_map(
+                'unserialize',
+                array_unique(array_map('serialize', $this->pivotTables))
+            );
+
+            $this->line('');
+            foreach ($this->pivotTables as $tables) {
+                $this->info('Building Pivot-Table ' . $tables[0] . ' - ' . $tables[1]);
+                $this->call('wn:pivot-table', [
+                    'model1' => $tables[0],
+                    'model2' => $tables[1],
+                    '--force' => $this->option('force')
+                ]);
+
+                // $this->call('wn:pivot-seeder', [
+                //     'model1' => $tables[0],
+                //     'model2' => $tables[1],
+                //     '--force' => $this->option('force')
+                // ]);
+            }
+
+            $this->morphTables = array_map(
+                'unserialize',
+                array_unique(array_map('serialize', $this->morphTables))
+            );
+
+            $this->line('');
+            foreach ($this->morphTables as $tables) {
+                $this->info('Building Morph-Table ' . $tables[0] . ' - ' . $tables[1]);
+                $this->call('wn:morph-table', [
+                    'model' => $tables[0],
+                    'morphable' => $tables[1],
+                    '--force' => $this->option('force')
+                ]);
+
+                // $this->call('wn:pivot-seeder', [
+                //     'model1' => $tables[0],
+                //     'model2' => $tables[1],
+                //     '--force' => $this->option('force')
+                // ]);
+            }
+
+            if (!$this->option('no-migration')) {
+                $this->call('migrate');
+            }
         }
     }
 
@@ -328,10 +328,10 @@ 
                 $deps = $this->getArgumentParser('relations')->parse($this->nodes[$key]['belongsTo']);
                 foreach($deps as $dependency) {
                     if(! $dependency['model']){
-	                    $dependency['model'] = $dependency['name'];
-	                } else if(strpos($dependency['model'], '\\') !== false ){
-	                    $dependency['model'] = substr($dependency['model'], strpos($dependency['model'], '\\')+1);
-	                }
+                        $dependency['model'] = $dependency['name'];
+                    } else if(strpos($dependency['model'], '\\') !== false ){
+                        $dependency['model'] = substr($dependency['model'], strpos($dependency['model'], '\\')+1);
+                    }
                     $dependency['model'] = studly_case(str_singular($dependency['model']));
                     if ($dependency['model'] != $key) {
                         $tmp = $this->getDependencies($dependency['model'], $seen);

Spacing +41 added lines, -41 removed lines

@@ -36,12 +36,12 @@ 
         $files = $this->argument('files');
         $this->nodes = [];
         foreach ($files as $file) {
-        	$this->info("Reading file ".$file);
+        	$this->info("Reading file " . $file);
 
         	$content = $this->fs->get($file);
         	$content = Yaml::parse($content);
 
-        	foreach ($content as $model => $i){
+        	foreach ($content as $model => $i) {
         		/*
         			$i['modelname'] = as originally in YAML defined
         			$i['name']      = as originally defined in snake_case
@@ -54,12 +54,12 @@ 
 
         		if (empty($this->nodes[$model]) || $this->option('force-redefine')) {
         			if (!empty($this->nodes[$model])) {
-        				$this->checkError($model . ": forced to redefine (in file " . $this->nodes[$model]['filename'] . ", redefined from file ".$file.")");
+        				$this->checkError($model . ": forced to redefine (in file " . $this->nodes[$model]['filename'] . ", redefined from file " . $file . ")");
         			}
         			$i = $this->getResourceParams($i);
         			$this->nodes[$model] = $i;
         		} else {
-        			$this->checkError($model . ": already defined (in file " . $this->nodes[$model]['filename'] . ", trying to redefine from file ".$file."; Use --force-redefine to force redefinition)");
+        			$this->checkError($model . ": already defined (in file " . $this->nodes[$model]['filename'] . ", trying to redefine from file " . $file . "; Use --force-redefine to force redefinition)");
         		}
         	}
         }
@@ -69,7 +69,7 @@ 
 
         $this->nodes = $this->sortDependencies();
 
-        if (! $this->option('skip-check')) {
+        if (!$this->option('skip-check')) {
         	$this->info('Checking Relationships...');
         	$keys = array_keys($this->nodes);
         	foreach ($this->nodes as $model => $i) {
@@ -88,17 +88,17 @@ 
         	$this->printErrors();
         }
 
-        $proceed = (! $this->option('check-only') && $this->checkedErrors == 0) || $this->option('skip-check');
-        if (! $this->option('check-only') && $this->checkedErrors > 0) {
+        $proceed = (!$this->option('check-only') && $this->checkedErrors == 0) || $this->option('skip-check');
+        if (!$this->option('check-only') && $this->checkedErrors > 0) {
         	$this->line('');
         	$proceed = $this->confirm("We have found " . $this->checkedErrors . " errors. Are you sure you want to continue?");
         }
         if ($proceed) {
         	$modelIndex = 0;
-            $migrationIdLength = strlen((string)count($this->nodes));
+            $migrationIdLength = strlen((string) count($this->nodes));
         	foreach ($this->nodes as $i) {
-        		$migrationName = 'Create' .  ucwords(str_plural($i['name']));
-        		$migrationFile = date('Y_m_d_His') . '-' . str_pad($modelIndex , $migrationIdLength, 0, STR_PAD_LEFT) . '_' . snake_case($migrationName) . '_table';
+        		$migrationName = 'Create' . ucwords(str_plural($i['name']));
+        		$migrationFile = date('Y_m_d_His') . '-' . str_pad($modelIndex, $migrationIdLength, 0, STR_PAD_LEFT) . '_' . snake_case($migrationName) . '_table';
 
         		$this->line('');
         		$this->info('Building Model ' . $i['uniquename']);
@@ -199,39 +199,39 @@ 
         $i['modelname'] = $i['modelname'];
         $i['uniquename'] = $i['uniquename'];
 
-        foreach(['hasMany', 'hasOne', 'add', 'belongsTo', 'belongsToMany', 'hasManyThrough', 'morphTo', 'morphMany', 'morphToMany', 'morphedByMany'] as $relation){
-            if(isset($i[$relation])){
+        foreach (['hasMany', 'hasOne', 'add', 'belongsTo', 'belongsToMany', 'hasManyThrough', 'morphTo', 'morphMany', 'morphToMany', 'morphedByMany'] as $relation) {
+            if (isset($i[$relation])) {
                 $i[$relation] = $this->convertArray($i[$relation], ' ', ',');
             } else {
                 $i[$relation] = false;
             }
         }
 
-        if($i['belongsToMany']){
+        if ($i['belongsToMany']) {
             $relations = $this->getArgumentParser('relations')->parse($i['belongsToMany']);
-            foreach ($relations as $relation){
+            foreach ($relations as $relation) {
                 $table = '';
 
-                if(! $relation['model']){
+                if (!$relation['model']) {
                     $table = snake_case($relation['name']);
                 } else {
                     $names = array_reverse(explode("\\", $relation['model']));
                     $table = snake_case($names[0]);
                 }
 
-                $tables = [ str_singular($table), $i['name'] ];
+                $tables = [str_singular($table), $i['name']];
                 sort($tables);
                 $tables[] = $modelName;
                 $this->pivotTables[] = $tables;
             }
         }
 
-        if($i['morphToMany']){
+        if ($i['morphToMany']) {
             $relations = $this->getArgumentParser('relations-morphMany')->parse($i['morphToMany']);
-            foreach ($relations as $relation){
+            foreach ($relations as $relation) {
                 $table = '';
 
-                if(! $relation['through']){
+                if (!$relation['through']) {
                     $names = array_reverse(explode("\\", $relation['model']));
                     $morphable = snake_case($names[0]);
                     $model = snake_case($relation['name']);
@@ -242,17 +242,17 @@ 
                     $model = snake_case($names[0]);
                 }
 
-                $tables = [ str_singular($model), str_singular($morphable), $modelName ];
+                $tables = [str_singular($model), str_singular($morphable), $modelName];
                 $this->morphTables[] = $tables;
             }
         }
 
-        if($i['morphedByMany']){
+        if ($i['morphedByMany']) {
             $relations = $this->getArgumentParser('relations-morphMany')->parse($i['morphedByMany']);
-            foreach ($relations as $relation){
+            foreach ($relations as $relation) {
                 $table = '';
 
-                if(! $relation['through']){
+                if (!$relation['through']) {
                     $names = array_reverse(explode("\\", $relation['model']));
                     $morphable = snake_case($names[0]);
                 } else {
@@ -260,13 +260,13 @@ 
                     $morphable = snake_case($names[0]);
                 }
 
-                $tables = [ str_singular($i['name']), str_singular($morphable), $modelName ];
+                $tables = [str_singular($i['name']), str_singular($morphable), $modelName];
                 $this->morphTables[] = $tables;
             }
         }
 
         $fields = [];
-        foreach($i['fields'] as $name => $value) {
+        foreach ($i['fields'] as $name => $value) {
             $value['name'] = $name;
             $fields[] = $this->serializeField($value);
         }
@@ -284,7 +284,7 @@ 
 
         $string = "{$name};{$schema};{$rules};{$tags}";
 
-        if(isset($field['factory']) && !empty($field['factory'])){
+        if (isset($field['factory']) && !empty($field['factory'])) {
             $string .= ';' . $field['factory'];
         }
 
@@ -293,7 +293,7 @@ 
 
     protected function convertArray($list, $old, $new)
     {
-        return implode($new, array_filter(explode($old, $list), function($item){
+        return implode($new, array_filter(explode($old, $list), function($item) {
             return !empty($item);
         }));
     }
@@ -302,7 +302,7 @@ 
         $load_order = array();
         $seen       = array();
 
-        foreach($this->nodes as $key => $item) {
+        foreach ($this->nodes as $key => $item) {
             $tmp = $this->getDependencies($key, $seen);
 
             // if($tmp[2] === false) {
@@ -315,22 +315,22 @@ 
     }
 
     private function getDependencies($key, $seen = array()) {
-        if(array_key_exists($key, $seen) == true) {
+        if (array_key_exists($key, $seen) == true) {
             return array(array(), $seen);
         }
 
 
-        if(!empty($this->nodes[$key])) {
+        if (!empty($this->nodes[$key])) {
             $order = array();
             // $failed         = array();
 
-            if($this->nodes[$key]['belongsTo']) {
+            if ($this->nodes[$key]['belongsTo']) {
                 $deps = $this->getArgumentParser('relations')->parse($this->nodes[$key]['belongsTo']);
-                foreach($deps as $dependency) {
-                    if(! $dependency['model']){
+                foreach ($deps as $dependency) {
+                    if (!$dependency['model']) {
 	                    $dependency['model'] = $dependency['name'];
-	                } else if(strpos($dependency['model'], '\\') !== false ){
-	                    $dependency['model'] = substr($dependency['model'], strpos($dependency['model'], '\\')+1);
+	                } else if (strpos($dependency['model'], '\\') !== false) {
+	                    $dependency['model'] = substr($dependency['model'], strpos($dependency['model'], '\\') + 1);
 	                }
                     $dependency['model'] = studly_case(str_singular($dependency['model']));
                     if ($dependency['model'] != $key) {
@@ -349,10 +349,10 @@ 
             $order[$key] = $this->nodes[$key];
             // $failed     = (count($failed) > 0) ? $failed : false;
 
-            return array($order, $seen);//, $failed
+            return array($order, $seen); //, $failed
         }
 
-        return array(array(), $seen);//, array($item)
+        return array(array(), $seen); //, array($item)
     }
 
     protected function checkError($message, $model = "", $file = "") {
@@ -377,10 +377,10 @@ 
         if ($relations) {
             $position = array_search($model, $keys);
             $relations = $this->getArgumentParser('relations')->parse($relations);
-            foreach($relations as $relation) {
-                switch($type) {
+            foreach ($relations as $relation) {
+                switch ($type) {
                     case "belongsTo":
-                        $rModel = $relation['model']?$relation['model']:$relation['name']; break;
+                        $rModel = $relation['model'] ? $relation['model'] : $relation['name']; break;
                 }
 
                 $search = array_search(studly_case(str_singular($rModel)), $keys);
@@ -397,7 +397,7 @@ 
 
     protected function checkPivotRelations($relations, $rType) {
         if ($relations) {
-            foreach($relations as $relation) {
+            foreach ($relations as $relation) {
                 $relation['0'] = studly_case(str_singular($relation['0']));
                 $relation['1'] = studly_case(str_singular($relation['1']));
                 $relation['2'] = studly_case(str_singular($relation['2']));

lumen-test/app/Http/routes.php

Spacing +1 added lines, -1 removed lines

@@ -11,6 +11,6 @@
 |
 */
 
-$router->get("/", function () use ($router) {
+$router->get("/", function() use ($router) {
     return 'Hello World';
 });

lumen-test/bootstrap/app.php

Spacing +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 try {
-    (new Dotenv\Dotenv(__DIR__.'/../'))->load();
+    (new Dotenv\Dotenv(__DIR__ . '/../'))->load();
 } catch (Dotenv\Exception\InvalidPathException $e) {
     //
 }
@@ -20,7 +20,7 @@ 
 */
 
 $app = new Laravel\Lumen\Application(
-    realpath(__DIR__.'/../')
+    realpath(__DIR__ . '/../')
 );
 
 $app->withFacades();
@@ -98,8 +98,8 @@ 
 
 $app->router->group([
     'namespace' => 'App\Http\Controllers',
-], function ($router) {
-    require __DIR__.'/../app/Http/routes.php';
+], function($router) {
+    require __DIR__ . '/../app/Http/routes.php';
 });
 
 return $app;

lumen-test/tests/acceptance/ResourceCommandCept.php

Spacing +10 added lines, -10 removed lines

@@ -14,10 +14,10 @@ 
 $I->seeInThisFile('protected $fillable = ["name", "descr", "due", "project_id", "creator_id"];');
 $I->seeInThisFile('protected $dates = ["due"];');
 $I->seeInThisFile(
-"public static \$rules = [\n".
+"public static \$rules = [\n" .
 "        \"name\" => \"requied\"," . PHP_EOL .
 "        \"project_id\" => \"required|numeric\"," . PHP_EOL .
-"        \"creator_id\" => \"required|numeric\",\n".
+"        \"creator_id\" => \"required|numeric\",\n" .
 "    ];");
 $I->seeInThisFile(
 '    public function tags()
@@ -47,19 +47,19 @@ 
 $I->openFile('./database/migrations/create_task_categories.php');
 
 $I->seeInThisFile('class CreateTaskCategoriesTable extends Migration');
-$I->seeInThisFile("Schema::create('task_categories', function(Blueprint \$table) {\n".
-"            \$table->increments('id');\n".
+$I->seeInThisFile("Schema::create('task_categories', function(Blueprint \$table) {\n" .
+"            \$table->increments('id');\n" .
 "            \$table->string('name')->unique();" . PHP_EOL .
 "            \$table->text('descr')->nullable();" . PHP_EOL .
 "            \$table->timestamp('due');" . PHP_EOL .
-"            \$table->integer('project_id')->unsigned();" . PHP_EOL.
+"            \$table->integer('project_id')->unsigned();" . PHP_EOL .
 "            \$table->integer('creator_id')->unsigned();\n" .
-"            \$table->foreign('project_id')\n".
-"                ->references('id')\n".
+"            \$table->foreign('project_id')\n" .
+"                ->references('id')\n" .
 "                ->on('projects');" . PHP_EOL .
-"            \$table->foreign('creator_id')\n".
-"                ->references('id')\n".
-"                ->on('users');\n".
+"            \$table->foreign('creator_id')\n" .
+"                ->references('id')\n" .
+"                ->on('users');\n" .
 "            \$table->timestamps();");
 
 $I->deleteFile('./database/migrations/create_task_categories.php');

src/CommandsServiceProvider.php

Spacing +26 added lines, -26 removed lines

@@ -22,92 +22,92 @@
         // registerTestCommand
     }
 
-    protected function registerModelCommand(){
-        $this->app->singleton('command.wn.model', function($app){
+    protected function registerModelCommand() {
+        $this->app->singleton('command.wn.model', function($app) {
             return $app['Wn\Generators\Commands\ModelCommand'];
         });
         $this->commands('command.wn.model');
     }
 
-    protected function registerControllerRestActionsCommand(){
-        $this->app->singleton('command.wn.controller.rest-actions', function($app){
+    protected function registerControllerRestActionsCommand() {
+        $this->app->singleton('command.wn.controller.rest-actions', function($app) {
             return $app['Wn\Generators\Commands\ControllerRestActionsCommand'];
         });
         $this->commands('command.wn.controller.rest-actions');
     }
 
-    protected function registerControllerCommand(){
-        $this->app->singleton('command.wn.controller', function($app){
+    protected function registerControllerCommand() {
+        $this->app->singleton('command.wn.controller', function($app) {
             return $app['Wn\Generators\Commands\ControllerCommand'];
         });
         $this->commands('command.wn.controller');
     }
 
-    protected function registerMigrationCommand(){
-        $this->app->singleton('command.wn.migration', function($app){
+    protected function registerMigrationCommand() {
+        $this->app->singleton('command.wn.migration', function($app) {
             return $app['Wn\Generators\Commands\MigrationCommand'];
         });
         $this->commands('command.wn.migration');
     }
 
-    protected function registerRouteCommand(){
-        $this->app->singleton('command.wn.route', function($app){
+    protected function registerRouteCommand() {
+        $this->app->singleton('command.wn.route', function($app) {
             return $app['Wn\Generators\Commands\RouteCommand'];
         });
         $this->commands('command.wn.route');
     }
 
-    protected function registerTestCommand(){
-        $this->app->singleton('command.wn.test', function($app){
+    protected function registerTestCommand() {
+        $this->app->singleton('command.wn.test', function($app) {
             return $app['Wn\Generators\Commands\TestCommand'];
         });
         $this->commands('command.wn.test');
     }
 
-    protected function registerResourceCommand(){
-        $this->app->singleton('command.wn.resource', function($app){
+    protected function registerResourceCommand() {
+        $this->app->singleton('command.wn.resource', function($app) {
             return $app['Wn\Generators\Commands\ResourceCommand'];
         });
         $this->commands('command.wn.resource');
     }
 
-    protected function registerResourcesCommand(){
-        $this->app->singleton('command.wn.resources', function($app){
+    protected function registerResourcesCommand() {
+        $this->app->singleton('command.wn.resources', function($app) {
             return $app['Wn\Generators\Commands\ResourcesCommand'];
         });
         $this->commands('command.wn.resources');
     }
 
-    protected function registerPivotTableCommand(){
-        $this->app->singleton('command.wn.pivot-table', function($app){
+    protected function registerPivotTableCommand() {
+        $this->app->singleton('command.wn.pivot-table', function($app) {
             return $app['Wn\Generators\Commands\PivotTableCommand'];
         });
         $this->commands('command.wn.pivot-table');
     }
 
-    protected function registerMorphTableCommand(){
-        $this->app->singleton('command.wn.morph-table', function($app){
+    protected function registerMorphTableCommand() {
+        $this->app->singleton('command.wn.morph-table', function($app) {
             return $app['Wn\Generators\Commands\MorphTableCommand'];
         });
         $this->commands('command.wn.morph-table');
     }
 
-    protected function registerFactoryCommand(){
-        $this->app->singleton('command.wn.factory', function($app){
+    protected function registerFactoryCommand() {
+        $this->app->singleton('command.wn.factory', function($app) {
             return $app['Wn\Generators\Commands\FactoryCommand'];
         });
         $this->commands('command.wn.factory');
     }
 
-    protected function registerSeederCommand(){
-        $this->app->singleton('command.wn.seeder', function($app){
+    protected function registerSeederCommand() {
+        $this->app->singleton('command.wn.seeder', function($app) {
             return $app['Wn\Generators\Commands\SeederCommand'];
         });
         $this->commands('command.wn.seeder');
     }
 
-    protected function registerPivotSeederCommand(){
-        $this->app->singleton('command.wn.pivot.seeder', function($app){
+    protected function registerPivotSeederCommand() {
+        $this->app->singleton('command.wn.pivot.seeder', function($app) {
             return $app['Wn\Generators\Commands\PivotSeederCommand'];
         });
         $this->commands('command.wn.pivot.seeder');

src/Commands/MigrationCommand.php

Spacing +16 added lines, -16 removed lines

@@ -24,8 +24,8 @@ 
         $snakeName = snake_case($name);
 
         $file = $this->option('file');
-        if(! $file){
-            $name = "Migration".sprintf('%06d', self::$COUNTER++) . $name;
+        if (!$file) {
+            $name = "Migration" . sprintf('%06d', self::$COUNTER++) . $name;
             $file = date('Y_m_d_His_') . snake_case($name) . '_table';
         }
 
@@ -40,10 +40,10 @@ 
             ->get();
 
         $file = $this->option('file');
-        if(! $file){
+        if (!$file) {
             $file = date('Y_m_d_His_') . $snakeName . '_table';
             $this->deleteOldMigration($snakeName);
-        }else{
+        } else {
             $this->deleteOldMigration($file);
         }
 
@@ -52,10 +52,10 @@ 
 
     protected function deleteOldMigration($fileName)
     {
-        foreach (new \DirectoryIterator("./database/migrations/") as $fileInfo){
-            if($fileInfo->isDot()) continue;
+        foreach (new \DirectoryIterator("./database/migrations/") as $fileInfo) {
+            if ($fileInfo->isDot()) continue;
 
-            if(strpos($fileInfo->getFilename(), $fileName) !== FALSE){
+            if (strpos($fileInfo->getFilename(), $fileName) !== FALSE) {
                 unlink($fileInfo->getPathname());
             }
         }
@@ -64,12 +64,12 @@ 
     protected function getSchema()
     {
         $schema = $this->option('schema');
-        if(! $schema){
+        if (!$schema) {
             return $this->spaces(12) . "// Schema declaration";
         }
 
         $items = $schema;
-        if( ! $this->option('parsed')){
+        if (!$this->option('parsed')) {
             $items = $this->getArgumentParser('schema')->parse($schema);
         }
 
@@ -103,7 +103,7 @@ 
         $name = $parts[0]['name'];
         $parts[1]['args'] = array_merge(["'{$name}'"], $parts[1]['args']);
         unset($parts[0]);
-        $parts = array_map(function($part){
+        $parts = array_map(function($part) {
             return '->' . $part['name'] . '(' . implode(', ', $part['args']) . ')';
         }, $parts);
         return "            \$table" . implode('', $parts) . ';';
@@ -112,12 +112,12 @@ 
     protected function getConstraints()
     {
         $keys = $this->option('keys');
-        if(! $keys){
+        if (!$keys) {
             return $this->spaces(12) . "// Constraints declaration";
         }
 
         $items = $keys;
-        if(! $this->option('parsed')){
+        if (!$this->option('parsed')) {
             $items = $this->getArgumentParser('foreign-keys')->parse($keys);
         }
 
@@ -131,10 +131,10 @@ 
 
     protected function getConstraintDeclaration($key)
     {
-        if(! $key['column']){
+        if (!$key['column']) {
             $key['column'] = 'id';
         }
-        if(! $key['table']){
+        if (!$key['table']) {
             $key['table'] = substr($key['name'], 0, count($key['name']) - 4);
         }
 
@@ -146,7 +146,7 @@ 
             ])
             ->get();
 
-        if($key['on_delete']){
+        if ($key['on_delete']) {
             $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint')
                     ->with([
                         'event' => 'Delete',
@@ -155,7 +155,7 @@ 
                     ->get();
         }
 
-        if($key['on_update']){
+        if ($key['on_update']) {
             $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint')
                     ->with([
                         'event' => 'Update',

src/Commands/RouteCommand.php

Indentation +13 added lines, -13 removed lines

@@ -5,7 +5,7 @@ 
 
 class RouteCommand extends BaseCommand {
 
-	protected $signature = 'wn:route
+    protected $signature = 'wn:route
 		{resource : Name of the resource.}
         {--controller= : Name of the RESTful controller.}
 		{--controller-namespace= : Namespace of the RESTful controller if not default.}
@@ -13,22 +13,22 @@ 
         {--laravel= : Use Laravel style route definitions}
     ';
 
-	protected $description = 'Generates RESTful routes.';
+    protected $description = 'Generates RESTful routes.';
 
     public function handle()
     {
         $resource = $this->argument('resource');
         $laravelRoutes = $this->option('laravel');
-		$templateFile = 'routes';
+        $templateFile = 'routes';
         $routesPath = $this->option('path') ?: 'routes/web.php';
         if ($laravelRoutes) {
             $templateFile = 'routes-laravel';
             $routesPath = $this->option('path') ?: 'routes/api.php';
-			if (!$this->fs->isFile($routesPath)) {
-				if (!$this->fs->isDirectory(\dirname($routesPath))) {
-					$this->fs->makeDirectory(\dirname($routesPath));
-				}
-				$this->fs->put($routesPath, "
+            if (!$this->fs->isFile($routesPath)) {
+                if (!$this->fs->isDirectory(\dirname($routesPath))) {
+                    $this->fs->makeDirectory(\dirname($routesPath));
+                }
+                $this->fs->put($routesPath, "
 	<?php
 
 	use Illuminate\Http\Request;
@@ -49,11 +49,11 @@ 
 	});
 
 			");
-			}
+            }
+        }
+        if ($this->option('controller-namespace')) {
+            $templateFile .= '-namespace';
         }
-		if ($this->option('controller-namespace')) {
-			$templateFile .= '-namespace';
-		}
 
         if (!$this->fs->isFile($routesPath)) {
             $routesPath = 'app/Http/routes.php';
@@ -64,7 +64,7 @@ 
                 ->with([
                     'resource' => $resource,
                     'controller' => $this->getController(),
-					'namespace' => $this->option('controller-namespace'),
+                    'namespace' => $this->option('controller-namespace'),
                 ])
                 ->get();
         $this->save($content, $routesPath, "{$resource} routes", true);