webNeat / lumen-generators

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/FactoryCommand.php

Spacing +6 added lines, -6 removed lines

@@ -19,9 +19,9 @@ 
 
         $file = $this->getFile();
 
-        $content = ! $this->fs->exists($file) ? '' : $this->fs->get($file);
+        $content = !$this->fs->exists($file) ? '' : $this->fs->get($file);
 
-        $content .= $this->getTemplate(! $this->fs->exists($file) ? 'factory-create' : 'factory')
+        $content .= $this->getTemplate(!$this->fs->exists($file) ? 'factory-create' : 'factory')
             ->with([
                 'model' => $model,
                 'factory_fields' => $this->getFieldsContent()
@@ -34,7 +34,7 @@ 
     protected function getFile()
     {
         $file = $this->option('file');
-        if(! $file){
+        if (!$file) {
             $file = './database/factories/ModelFactory.php';
         }
         return $file;
@@ -46,12 +46,12 @@ 
 
         $fields = $this->option('fields');
 
-        if($fields){
-            if(! $this->option('parsed')){
+        if ($fields) {
+            if (!$this->option('parsed')) {
                 $fields = $this->getArgumentParser('factory-fields')->parse($fields);
             }
             $template = $this->getTemplate('factory/field');
-            foreach($fields as $field){
+            foreach ($fields as $field) {
                 $content[] = $template->with($field)->get();
             }
             $content = implode(PHP_EOL, $content);

src/Commands/MigrationCommand.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
         $snakeName = snake_case($name);
 
         $file = $this->option('file');
-        if (! $file) {
+        if (!$file) {
             $file = date('Y_m_d_His_') . $snakeName . '_table';
             $this->deleteOldMigration($snakeName);
         } else {
@@ -46,10 +46,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());
             }
         }
@@ -92,7 +92,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) . ';';
@@ -115,10 +115,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);
         }
 
@@ -130,7 +130,7 @@ 
             ])
             ->get();
 
-        if($key['on_delete']){
+        if ($key['on_delete']) {
             $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint')
                     ->with([
                         'event' => 'Delete',
@@ -139,7 +139,7 @@ 
                     ->get();
         }
 
-        if($key['on_update']){
+        if ($key['on_update']) {
             $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint')
                     ->with([
                         'event' => 'Update',

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
     protected function deleteOldMigration($fileName)
     {
         foreach (new \DirectoryIterator("./database/migrations/") as $fileInfo){
-            if($fileInfo->isDot()) continue;
+            if($fileInfo->isDot()) {
+                continue;
+            }
 
             if(strpos($fileInfo->getFilename(), $fileName) !== FALSE){
                 unlink($fileInfo->getPathname());

Doc Comments +3 added lines

@@ -92,6 +92,9 @@
         return $this->buildParameters($this->parseValue($keys, 'foreign-keys'), "// Constraints declaration", [$this, 'getConstraintDeclaration']);
     }
 
+    /**
+     * @param string $emptyPlaceholder
+     */
     protected function buildParameters($items, $emptyPlaceholder, $callback = null) {
         if ($items === false) {
             return $this->spaces(12) . $emptyPlaceholder;

src/Commands/ResourcesCommand.php

Indentation +28 added lines, -28 removed lines

@@ -46,45 +46,45 @@ 
         $morphTables = $this->uniqueArray($this->getTables($nodes, 'morphTables'));
 
         if (! $this->option('skip-check')) {
-        	$this->info('Checking Relationships...');
-        	$keys = array_keys($nodes);
-        	foreach ($nodes as $model => $i) {
-        		$this->checkRelations($i['belongsTo'], 'belongsTo', $i['filename'], $i['uniquename'], $keys);
-        		// $this->checkRelations($i['hasManyThrough'], 'hasManyThrough', $file, $model);
-        	}
-        	$this->checkPivotRelations($nodes, $pivotTables, 'pivot');
-        	$this->checkPivotRelations($nodes, $morphTables, 'morph');
+            $this->info('Checking Relationships...');
+            $keys = array_keys($nodes);
+            foreach ($nodes as $model => $i) {
+                $this->checkRelations($i['belongsTo'], 'belongsTo', $i['filename'], $i['uniquename'], $keys);
+                // $this->checkRelations($i['hasManyThrough'], 'hasManyThrough', $file, $model);
+            }
+            $this->checkPivotRelations($nodes, $pivotTables, 'pivot');
+            $this->checkPivotRelations($nodes, $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) {
-        	$this->buildResources($nodes);
+            $this->buildResources($nodes);
 
-        	// if (!$this->option('no-migration')) {
-        	// 	$this->call('migrate'); // actually needed for pivot seeders !
-        	// }
+            // if (!$this->option('no-migration')) {
+            // 	$this->call('migrate'); // actually needed for pivot seeders !
+            // }
 
-        	$this->line('');
+            $this->line('');
             $this->buildTables('Pivot-Table', 'wn:pivot-table', 'model1', 'model2', $pivotTables);
 
-        	$this->line('');
+            $this->line('');
             $this->buildTables('Morph-Table', 'wn:morph-table', 'model', 'morphable', $morphTables);
 
-        	if (!$this->option('no-migration')) {
-        		$this->call('migrate');
-        	}
+            if (!$this->option('no-migration')) {
+                $this->call('migrate');
+            }
         }
     }
 
@@ -371,10 +371,10 @@ 
                 $deps = $this->getArgumentParser('relations')->parse($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); // Cut offs first namespace part
-	                }
+                        $dependency['model'] = $dependency['name'];
+                    } else if(strpos($dependency['model'], '\\') !== false ){
+                        $dependency['model'] = substr($dependency['model'], strpos($dependency['model'], '\\')+1); // Cut offs first namespace part
+                    }
                     $dependency['model'] = studly_case(str_singular($dependency['model']));
                     if ($dependency['model'] != $key) {
                         $tmp = $this->getDependencies($nodes, $dependency['model'], $seen);

Spacing +41 added lines, -41 removed lines

@@ -40,7 +40,7 @@ 
             return;
         }
         if (is_string($files)) {
-            $files = [ $files ];
+            $files = [$files];
         }
 
         foreach ($files as $file) {
@@ -54,7 +54,7 @@ 
         $pivotTables = $this->uniqueArray($this->getTables($nodes, 'pivotTables'));
         $morphTables = $this->uniqueArray($this->getTables($nodes, 'morphTables'));
 
-        if (! $this->option('skip-check')) {
+        if (!$this->option('skip-check')) {
         	$this->info('Checking Relationships...');
         	$keys = array_keys($nodes);
         	foreach ($nodes as $model => $i) {
@@ -73,8 +73,8 @@ 
         	$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?");
         }
@@ -107,14 +107,14 @@ 
 
     protected function readFile($file)
     {
-        $this->info("Reading file ".$file);
+        $this->info("Reading file " . $file);
 
         $content = $this->fs->get($file);
         $content = Yaml::parse($content);
 
         $nodes = [];
 
-        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
@@ -132,7 +132,7 @@ 
     }
 
     protected function mergeNodes($nodes, $toMerge, $forceRedefinition = false) {
-        foreach($toMerge as $node) {
+        foreach ($toMerge as $node) {
             $nodes = $this->mergeNode($nodes, $node, $forceRedefinition);
         }
 
@@ -142,11 +142,11 @@ 
     protected function mergeNode($nodes, $toMerge, $forceRedefinition = false) {
         if (empty($nodes[$toMerge['uniquename']]) || $forceRedefinition) {
             if (!empty($nodes[$toMerge['uniquename']])) {
-                $this->checkError($toMerge['uniquename'] . ": forced to redefine (in file " . $nodes[$toMerge['uniquename']]['filename'] . ", redefined from file ".$toMerge['filename'].")");
+                $this->checkError($toMerge['uniquename'] . ": forced to redefine (in file " . $nodes[$toMerge['uniquename']]['filename'] . ", redefined from file " . $toMerge['filename'] . ")");
             }
             $nodes[$toMerge['uniquename']] = $toMerge;
         } else {
-            $this->checkError($toMerge['uniquename'] . ": already defined (in file " . $nodes[$toMerge['uniquename']]['filename'] . ", trying to redefine from file ".$toMerge['filename']."; Use --force-redefine to force redefinition)");
+            $this->checkError($toMerge['uniquename'] . ": already defined (in file " . $nodes[$toMerge['uniquename']]['filename'] . ", trying to redefine from file " . $toMerge['filename'] . "; Use --force-redefine to force redefinition)");
         }
 
         return $nodes;
@@ -154,7 +154,7 @@ 
 
     protected function getTables($nodes, $key) {
         $tables = [];
-        foreach($nodes as $node) {
+        foreach ($nodes as $node) {
             if (!empty($node[$key])) {
                 $tables = array_merge($tables, $node[$key]);
             }
@@ -166,10 +166,10 @@ 
     protected function buildResources($nodes)
     {
         $modelIndex = 0;
-        $migrationIdLength = strlen((string)count($nodes));
+        $migrationIdLength = strlen((string) count($nodes));
         foreach ($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']);
@@ -213,7 +213,7 @@ 
     protected function buildTables($type, $command, $model1, $model2, $tableAssignment)
     {
         foreach ($tableAssignment as $tables) {
-            $this->info('Building '.$type.' ' . $tables[0] . ' - ' . $tables[1]);
+            $this->info('Building ' . $type . ' ' . $tables[0] . ' - ' . $tables[1]);
             $this->call($command, [
                 $model1 => $tables[0],
                 $model2 => $tables[1],
@@ -237,28 +237,28 @@ 
         $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']) {
             $i['pivotTables'] = $this->belongsTo($i['name'], $modelName, $i['belongsToMany']);
         }
 
-        if($i['morphToMany']){
+        if ($i['morphToMany']) {
             $i['morphTables'] = $this->morphToMany($modelName, $i['morphToMany']);
         }
 
-        if($i['morphedByMany']){
+        if ($i['morphedByMany']) {
             $i['morphTables'] = array_merge($i['morphTables'], $this->morphedByMany($i['name'], $modelName, $i['morphedByMany']));
         }
 
         $fields = [];
-        foreach($i['fields'] as $name => $value) {
+        foreach ($i['fields'] as $name => $value) {
             $value['name'] = $name;
             $fields[] = $this->serializeField($value);
         }
@@ -271,7 +271,7 @@ 
     {
         $parsedRelations = [];
         $relations = $this->getArgumentParser($parser)->parse($relations);
-        foreach ($relations as $relation){
+        foreach ($relations as $relation) {
             $parsedRelations[] = $callback($relation);
         }
 
@@ -280,7 +280,7 @@ 
 
     protected function getConditionalTableName($condition, $then, $else)
     {
-        if($condition){
+        if ($condition) {
             return snake_case($this->extractClassName($then));
         } else {
             return snake_case($this->extractClassName($else));
@@ -290,8 +290,8 @@ 
     protected function belongsTo($name, $modelName, $belongsTo)
     {
         return $this->parseRelations('relations', $belongsTo, function($relation) use ($name, $modelName) {
-            $table = $this->getConditionalTableName(! $relation['model'], $relation['name'], $relation['model']);
-            $tables = [ str_singular($table), $name ];
+            $table = $this->getConditionalTableName(!$relation['model'], $relation['name'], $relation['model']);
+            $tables = [str_singular($table), $name];
             sort($tables);
             $tables[] = $modelName;
             return $tables;
@@ -301,7 +301,7 @@ 
     protected function morphToMany($modelName, $morphToMany)
     {
         return $this->parseRelations('relations-morphMany', $morphToMany, function($relation) use ($modelName) {
-            $name = $this->getConditionalTableName(! $relation['through'], $relation['name'], $relation['model']);
+            $name = $this->getConditionalTableName(!$relation['through'], $relation['name'], $relation['model']);
             return $this->getMorphableRelation($relation, $name, $modelName);
         });
     }
@@ -314,8 +314,8 @@ 
     }
 
     protected function getMorphableRelation($relation, $relationName, $modelName) {
-        $morphable = $this->getConditionalTableName(! $relation['through'], $relation['model'], $relation['through']);
-        return [ str_singular($relationName), str_singular($morphable), $modelName ];
+        $morphable = $this->getConditionalTableName(!$relation['through'], $relation['model'], $relation['through']);
+        return [str_singular($relationName), str_singular($morphable), $modelName];
     }
 
     protected function serializeField($field)
@@ -327,7 +327,7 @@ 
 
         $string = "{$name};{$schema};{$rules};{$tags}";
 
-        if(isset($field['factory']) && !empty($field['factory'])){
+        if (isset($field['factory']) && !empty($field['factory'])) {
             $string .= ';' . $field['factory'];
         }
 
@@ -336,7 +336,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);
         }));
     }
@@ -345,7 +345,7 @@ 
         $load_order = array();
         $seen       = array();
 
-        foreach($nodes as $key => $item) {
+        foreach ($nodes as $key => $item) {
             $tmp = $this->getDependencies($nodes, $key, $seen);
 
             // if($tmp[2] === false) {
@@ -358,22 +358,22 @@ 
     }
 
     private function getDependencies($nodes, $key, $seen = array()) {
-        if(array_key_exists($key, $seen) === true) {
+        if (array_key_exists($key, $seen) === true) {
             return array(array(), $seen);
         }
 
 
-        if(!empty($nodes[$key])) {
+        if (!empty($nodes[$key])) {
             $order = array();
             // $failed         = array();
 
-            if($nodes[$key]['belongsTo']) {
+            if ($nodes[$key]['belongsTo']) {
                 $deps = $this->getArgumentParser('relations')->parse($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); // Cut offs first namespace part
+	                } else if (strpos($dependency['model'], '\\') !== false) {
+	                    $dependency['model'] = substr($dependency['model'], strpos($dependency['model'], '\\') + 1); // Cut offs first namespace part
 	                }
                     $dependency['model'] = studly_case(str_singular($dependency['model']));
                     if ($dependency['model'] != $key) {
@@ -392,10 +392,10 @@ 
             $order[$key] = $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 = "") {
@@ -420,7 +420,7 @@ 
         if ($relations) {
             $position = array_search($model, $keys);
             $relations = $this->getArgumentParser('relations')->parse($relations);
-            foreach($relations as $relation) {
+            foreach ($relations as $relation) {
                 $rModel = $relation['model'] ? $relation['model'] : $relation['name'];
                 $search = array_search(studly_case(str_singular($rModel)), $keys);
                 if (($search === false || $search > $position) && !class_exists($this->prependNamespace($rModel)) && !class_exists($this->prependNamespace($rModel, 'App'))) {
@@ -436,7 +436,7 @@ 
 
     protected function checkPivotRelations($nodes, $relations, $relationType) {
         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']));

src/Commands/ModelCommand.php

Indentation +33 added lines, -33 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,32 +93,32 @@ 
             $template = $this->getTemplate($template);
             foreach ($items as $item) {
                 $item['type'] = $type;
-				if ($parser == 'relations') {
-					$item['model'] = $this->prependNamespace($item['model'] ?: $item['name']);
-				} else if ($parser != 'relations') {
-					switch($type) {
-						case "hasManyThrough":
-							if(! $item['through'] && $item['model']){
-								$item['through'] = $this->prependNamespace($item['model']);
-								$item['model'] = $this->prependNamespace($item['name']);
-							} else {
-								$item['through'] = $this->prependNamespace($item['through']);
-								$item['model'] = $this->prependNamespace($item['model']);
-							}
-							break;
-						case "morphMany":
-						case "morphToMany":
-						case "morphedByMany":
-							if(! $item['through']){
-								$item['through'] = $item['model'];
-								$item['model'] = $this->prependNamespace($item['name']);
-							} else {
-								$item['model'] = $this->prependNamespace($item['model']);
-							}
-							break;
-
-					}
-				}
+                if ($parser == 'relations') {
+                    $item['model'] = $this->prependNamespace($item['model'] ?: $item['name']);
+                } else if ($parser != 'relations') {
+                    switch($type) {
+                        case "hasManyThrough":
+                            if(! $item['through'] && $item['model']){
+                                $item['through'] = $this->prependNamespace($item['model']);
+                                $item['model'] = $this->prependNamespace($item['name']);
+                            } else {
+                                $item['through'] = $this->prependNamespace($item['through']);
+                                $item['model'] = $this->prependNamespace($item['model']);
+                            }
+                            break;
+                        case "morphMany":
+                        case "morphToMany":
+                        case "morphedByMany":
+                            if(! $item['through']){
+                                $item['through'] = $item['model'];
+                                $item['model'] = $this->prependNamespace($item['name']);
+                            } else {
+                                $item['model'] = $this->prependNamespace($item['model']);
+                            }
+                            break;
+
+                    }
+                }
                 $relations[] = $template->with($item)->get();
             }
         }
@@ -128,9 +128,9 @@ 
     protected function getRules()
     {
         $items = $this->parseValue($this->option('rules'), 'rules');
-		if ($items === false) {
-			return $this->spaces(8) . "// Validation rules";
-		}
+        if ($items === false) {
+            return $this->spaces(8) . "// Validation rules";
+        }
 
         $template = $this->getTemplate('model/rule');
         $rules = [];

Spacing +9 added lines, -9 removed lines

@@ -50,12 +50,12 @@ 
     protected function getAsArrayFields($arg, $isOption = true)
     {
     	$arg = ($isOption) ? $this->option($arg) : $this->argument($arg);
-        if(is_string($arg)){
+        if (is_string($arg)) {
         	$arg = explode(',', $arg);
-        } else if(! is_array($arg)) {
+        } else if (!is_array($arg)) {
             $arg = [];
         }
-        return implode(', ', array_map(function($item){
+        return implode(', ', array_map(function($item) {
             return '"' . $item . '"';
         }, $arg));
     }
@@ -74,7 +74,7 @@ 
             $this->getRelationsByType('morphedByMany', 'morphed-by-many', false, 'relations-morphMany')
         );
 
-        if(empty($relations)){
+        if (empty($relations)) {
             return "    // Relationships";
         }
 
@@ -85,20 +85,20 @@ 
     {
         $relations = [];
         $option = $this->option($option);
-        if($option){
+        if ($option) {
 
             $items = $this->getArgumentParser($parser)->parse($option);
 
-            $template = ($withTimestamps) ? 'model/relation-with-timestamps' : ($parser=='relations'?'model/relation':'model/relation-'.$type);
+            $template = ($withTimestamps) ? 'model/relation-with-timestamps' : ($parser == 'relations' ? 'model/relation' : 'model/relation-' . $type);
             $template = $this->getTemplate($template);
             foreach ($items as $item) {
                 $item['type'] = $type;
 				if ($parser == 'relations') {
 					$item['model'] = $this->prependNamespace($item['model'] ?: $item['name']);
 				} else if ($parser != 'relations') {
-					switch($type) {
+					switch ($type) {
 						case "hasManyThrough":
-							if(! $item['through'] && $item['model']){
+							if (!$item['through'] && $item['model']) {
 								$item['through'] = $this->prependNamespace($item['model']);
 								$item['model'] = $this->prependNamespace($item['name']);
 							} else {
@@ -109,7 +109,7 @@ 
 						case "morphMany":
 						case "morphToMany":
 						case "morphedByMany":
-							if(! $item['through']){
+							if (!$item['through']) {
 								$item['through'] = $item['model'];
 								$item['model'] = $this->prependNamespace($item['name']);
 							} else {

src/Commands/BaseCommand.php

Doc Comments +9 added lines

@@ -21,6 +21,9 @@ 
         $this->argumentFormatLoader = new ArgumentFormatLoader($fs);
     }
 
+    /**
+     * @param string $name
+     */
     protected function getTemplate($name)
     {
         return $this->templates->load($name);
@@ -31,6 +34,9 @@ 
         return new ArgumentParser($format);
     }
 
+    /**
+     * @param string $content
+     */
     protected function save($content, $path, $name, $force = false)
     {
         if (!$force && $this->fs->exists($path) && $this->input->hasOption('force') && !$this->option('force')) {
@@ -49,6 +55,9 @@ 
         }
     }
 
+    /**
+     * @param integer $n
+     */
     protected function spaces($n): string
     {
         return str_repeat(' ', $n);

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(string $path = null): string
     {
-		if (empty($path)) {
-			$path = $this->option('path');
-		}
+        if (empty($path)) {
+            $path = $this->option('path');
+        }
 
-    	return implode('\\', array_map('studly_case', array_filter(array_map('trim', explode('/', $path)), function($value) {
+        return implode('\\', array_map('studly_case', array_filter(array_map('trim', explode('/', $path)), function($value) {
             return !empty($value);
         })));
     }

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
         return $this->templates->load($name);
     }
 
-    protected function getArgumentParser($name){
+    protected function getArgumentParser($name) {
         $format = $this->argumentFormatLoader->load($name);
         return new ArgumentParser($format);
     }
@@ -67,11 +67,11 @@ 
 
     protected function parseValue($value, string $parser)
     {
-        if(! $value){
+        if (!$value) {
             return false;
         }
 
-        if(! $this->option('parsed')){
+        if (!$this->option('parsed')) {
             return $this->getArgumentParser($parser)->parse($value);
         }