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'];
         }));
     }

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/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/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/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";
     }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -33,14 +33,14 @@ 
     protected function parseFields()
     {
         $this->fields = array_map(function($arg, $app) {
-            return snake_case(str_singular($this->argument($arg)))."_".$app;
+            return snake_case(str_singular($this->argument($arg))) . "_" . $app;
         }, ['model', 'morphable', 'morphable'], ['id', 'id', 'type']);
 
     }
 
     protected function schema()
     {
-        return implode(' ', array_map(function($field){
+        return implode(' ', array_map(function($field) {
             return $field . ':' . (substr($field, -3) == '_id' ? 'integer:unsigned' : 'string.50') . ':index';
         }, $this->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";
     }
 
 }