webNeat / lumen-generators

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);

src/Commands/ResourcesCommand.php

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);

src/Commands/ModelCommand.php

Indentation +46 added lines, -46 removed lines

@@ -3,7 +3,7 @@ 
 
 class ModelCommand extends BaseCommand {
 
-	protected $signature = 'wn:model
+    protected $signature = 'wn:model
         {name : Name of the model.}
         {--fillable= : the fillable fields.}
         {--dates= : date fields.}
@@ -24,7 +24,7 @@ 
         {--force= : override the existing files}
     ';
 
-	protected $description = 'Generates a model class for a RESTfull resource';
+    protected $description = 'Generates a model class for a RESTfull resource';
 
     public function handle()
     {
@@ -49,9 +49,9 @@ 
 
     protected function getAsArrayFields($arg, $isOption = true)
     {
-    	$arg = ($isOption) ? $this->option($arg) : $this->argument($arg);
+        $arg = ($isOption) ? $this->option($arg) : $this->argument($arg);
         if(is_string($arg)){
-        	$arg = explode(',', $arg);
+            $arg = explode(',', $arg);
         } else if(! is_array($arg)) {
             $arg = [];
         }
@@ -93,48 +93,48 @@ 
             $template = $this->getTemplate($template);
             foreach ($items as $item) {
                 $item['type'] = $type;
-				if ($parser == 'relations') {
-					if(! $item['model']){
-	                    $item['model'] = $this->getNamespace() . '\\' . ucwords(str_singular($item['name']));
-	                } else if(strpos($item['model'], '\\') === false ){
-	                    $item['model'] = $this->getNamespace() . '\\' . $item['model'];
-	                }
-				} else if ($parser != 'relations') {
-					switch($type) {
-						case "hasManyThrough":
-							if(! $item['through'] && $item['model']){
-								$item['through'] = $item['model'];
-								$item['model'] = $item['name'];
-
-								if(strpos($item['through'], '\\') === false ){
-									$item['through'] = $this->getNamespace() . '\\' . ucwords(str_singular($item['through']));
-								}
-								if(strpos($item['model'], '\\') === false ){
-									$item['model'] = $this->getNamespace() . '\\' . ucwords(str_singular($item['model']));
-								}
-							} else {
-								if(strpos($item['through'], '\\') === false ){
-									$item['through'] = $this->getNamespace() . '\\' . $item['through'];
-								}
-								if(strpos($item['model'], '\\') === false ){
-									$item['model'] = $this->getNamespace() . '\\' . $item['model'];
-								}
-							}
-							break;
-						case "morphMany":
-						case "morphToMany":
-						case "morphedByMany":
-							if(! $item['through']){
-								$item['through'] = $item['model'];
-								$item['model'] = ucwords(str_singular($item['name']));
-							}
-							if(strpos($item['model'], '\\') === false ){
-								$item['model'] = $this->getNamespace() . '\\' . $item['model'];
-							}
-							break;
-
-					}
-				}
+                if ($parser == 'relations') {
+                    if(! $item['model']){
+                        $item['model'] = $this->getNamespace() . '\\' . ucwords(str_singular($item['name']));
+                    } else if(strpos($item['model'], '\\') === false ){
+                        $item['model'] = $this->getNamespace() . '\\' . $item['model'];
+                    }
+                } else if ($parser != 'relations') {
+                    switch($type) {
+                        case "hasManyThrough":
+                            if(! $item['through'] && $item['model']){
+                                $item['through'] = $item['model'];
+                                $item['model'] = $item['name'];
+
+                                if(strpos($item['through'], '\\') === false ){
+                                    $item['through'] = $this->getNamespace() . '\\' . ucwords(str_singular($item['through']));
+                                }
+                                if(strpos($item['model'], '\\') === false ){
+                                    $item['model'] = $this->getNamespace() . '\\' . ucwords(str_singular($item['model']));
+                                }
+                            } else {
+                                if(strpos($item['through'], '\\') === false ){
+                                    $item['through'] = $this->getNamespace() . '\\' . $item['through'];
+                                }
+                                if(strpos($item['model'], '\\') === false ){
+                                    $item['model'] = $this->getNamespace() . '\\' . $item['model'];
+                                }
+                            }
+                            break;
+                        case "morphMany":
+                        case "morphToMany":
+                        case "morphedByMany":
+                            if(! $item['through']){
+                                $item['through'] = $item['model'];
+                                $item['model'] = ucwords(str_singular($item['name']));
+                            }
+                            if(strpos($item['model'], '\\') === false ){
+                                $item['model'] = $this->getNamespace() . '\\' . $item['model'];
+                            }
+                            break;
+
+                    }
+                }
                 $relations[] = $template->with($item)->get();
             }
         }

src/Commands/BaseCommand.php

Indentation +7 added lines, -7 removed lines

@@ -10,10 +10,10 @@ 
 class BaseCommand extends Command {
 
     protected $fs;
-	protected $templates;
+    protected $templates;
 
-	public function __construct(Filesystem $fs)
-	{
+    public function __construct(Filesystem $fs)
+    {
         parent::__construct();
 
         $this->fs = $fs;
@@ -56,11 +56,11 @@ 
 
     protected function getNamespace($path = false)
     {
-		if (! $path) {
-			$path = $this->option('path');
-		}
+        if (! $path) {
+            $path = $this->option('path');
+        }
 
-    	return str_replace(' ', '\\', ucwords(trim(str_replace('/', ' ', $path))));
+        return str_replace(' ', '\\', ucwords(trim(str_replace('/', ' ', $path))));
     }
 
 }

src/Commands/ControllerCommand.php

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);
+    }
 
 }

src/Commands/MorphTableCommand.php

Indentation +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
 
 class MorphTableCommand extends BaseCommand {
 
-	protected $signature = 'wn:morph-table
+    protected $signature = 'wn:morph-table
         {model : Name of the persistant model or table}
         {morphable : Name of the morphable identifier}
         {--add= : specifies additional columns like timestamps, softDeletes, rememberToken and nullableTimestamps.}
@@ -11,7 +11,7 @@ 
         {--force= : override the existing files}
     ';
 
-	protected $description = 'Generates creation migration for a morphable pivot table';
+    protected $description = 'Generates creation migration for a morphable pivot table';
 
     protected $fields;
 
@@ -48,7 +48,7 @@ 
     protected function keys()
     {
         // return implode(' ', $this->fields);
-		return snake_case(str_singular($this->argument('model')))."_id";
+        return snake_case(str_singular($this->argument('model')))."_id";
     }
 
 }