webNeat / lumen-generators

src/Commands/PublishCommand.php

Indentation +2 added lines, -2 removed lines

@@ -6,10 +6,10 @@
 
 class PublishCommand extends Command {
 
-	protected $signature = 'wn:publish
+    protected $signature = 'wn:publish
         {--f : force the publishing.}
     ';
-	protected $description = 'Publishes the laravel-generators config file to the config folder of your project';
+    protected $description = 'Publishes the laravel-generators config file to the config folder of your project';
     protected $fs;
 
     public function __construct(Filesystem $fs)

Spacing +5 added lines, -5 removed lines

@@ -23,22 +23,22 @@
     {
         $paths = ServiceProvider::pathsToPublish('Wn\Generators\CommandsServiceProvider');
         
-        foreach($paths as $from => $to){
+        foreach ($paths as $from => $to) {
             $shortFrom = $this->shortPath($from);
             
-            if($this->copyFile($from, $to)) {
+            if ($this->copyFile($from, $to)) {
                 $this->info($shortFrom . ' has succesfully been copied to ' . $this->shortPath($to));
-            }else{
+            } else {
                 $this->warn($shortFrom . ' could not be copied. To try and force use the --f option.');
             }
         }
     }
     
-    private function shortPath($path){
+    private function shortPath($path) {
         return str_replace(base_path(), '', realpath($path));
     }
     
-    private function copyFile($from, $to){
+    private function copyFile($from, $to) {
         if ($this->fs->exists($to) && !$this->option('f')) {
             return false;
         }

Braces +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
             
             if($this->copyFile($from, $to)) {
                 $this->info($shortFrom . ' has succesfully been copied to ' . $this->shortPath($to));
-            }else{
+            } else{
                 $this->warn($shortFrom . ' could not be copied. To try and force use the --f option.');
             }
         }

src/CommandsServiceProvider.php

Spacing +28 added lines, -28 removed lines

@@ -6,7 +6,7 @@ 
 {
     public function boot()
     {
-        $configPath = __DIR__.'/../config/lumen-generators.php';
+        $configPath = __DIR__ . '/../config/lumen-generators.php';
         $this->publishes([
             $configPath => base_path('config/lumen-generators.php'),
         ]);
@@ -14,7 +14,7 @@ 
     
     public function register()
     {
-        $configPath = __DIR__.'/../config/lumen-generators.php';
+        $configPath = __DIR__ . '/../config/lumen-generators.php';
         $this->mergeConfigFrom($configPath, 'lumen-generators');
 
         $this->registerPublishCommand();
@@ -32,92 +32,92 @@ 
         // registerTestCommand
     }
 
-    protected function registerPublishCommand(){
-        $this->app->singleton('command.wn.publish', function($app){
+    protected function registerPublishCommand() {
+        $this->app->singleton('command.wn.publish', function($app) {
             return $app['Wn\Generators\Commands\PublishCommand'];
         });
         $this->commands('command.wn.publish');
     }
 
-    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 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/ModelCommand.php

Doc Comments +10 added lines

@@ -43,6 +43,9 @@ 
         $this->save($content, "./{$path}/{$name}.php", "{$name} model");
     }
 
+    /**
+     * @param string $rule
+     */
     protected function getFieldByRuleAsArrayFields($rule, $allowPartialMatch = false)
     {
         $rules = $this->getRules(false);
@@ -63,6 +66,9 @@ 
         }, $fields));
     }
 
+    /**
+     * @param string $arg
+     */
     protected function getAsArrayFields($arg, $isOption = true)
     {
     	$arg = ($isOption) ? $this->option($arg) : $this->argument($arg);
@@ -97,6 +103,10 @@ 
         return implode(PHP_EOL, $relations);
     }
 
+    /**
+     * @param string $type
+     * @param string $option
+     */
     protected function getRelationsByType($type, $option, $withTimestamps = false)
     {
         $relations = [];

Spacing +14 added lines, -14 removed lines

@@ -48,17 +48,17 @@ 
         $rules = $this->getRules(false);
         $fields = [];
                 
-        foreach($rules as $ruleId => $ruleData){
+        foreach ($rules as $ruleId => $ruleData) {
             $fieldRules = explode(',', $ruleData['rule']);
             
-            foreach($fieldRules as $fieldRule){
-                if($fieldRule === $rule || str_contains($fieldRule, $rule)){
+            foreach ($fieldRules as $fieldRule) {
+                if ($fieldRule === $rule || str_contains($fieldRule, $rule)) {
                     $fields[] = $ruleData['name'];
                 }
             }
         }
         
-        return implode(', ', array_map(function($item){
+        return implode(', ', array_map(function($item) {
             return '"' . $item . '"';
         }, $fields));
     }
@@ -66,12 +66,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));
     }
@@ -90,7 +90,7 @@ 
             $this->getRelationsByType('belongsToMany', 'belongs-to-many', true)
         );
 
-        if(empty($relations)){
+        if (empty($relations)) {
             return "    // Relationships";
         }
 
@@ -101,7 +101,7 @@ 
     {
         $relations = [];
         $option = $this->option($option);
-        if($option){
+        if ($option) {
 
             $items = $this->getArgumentParser('relations')->parse($option);
 
@@ -109,9 +109,9 @@ 
             $template = $this->getTemplate($template);
             foreach ($items as $item) {
                 $item['type'] = $type;
-                if(! $item['model']){
+                if (!$item['model']) {
                     $item['model'] = $this->getNamespace() . '\\' . ucwords(str_singular($item['name']));
-                } else if(strpos($item['model'], '\\') === false ){
+                } else if (strpos($item['model'], '\\') === false) {
                     $item['model'] = $this->getNamespace() . '\\' . $item['model'];
                 }
                 $relations[] = $template->with($item)->get();
@@ -123,11 +123,11 @@ 
     protected function getRules($inTemplate = true)
     {
         $rules = $this->option('rules');
-        if(! $rules){
+        if (!$rules) {
             return "        // Validation rules";
         }
         $items = $rules;
-        if(! $this->option('parsed')){
+        if (!$this->option('parsed')) {
             $items = $this->getArgumentParser('rules')->parse($rules);
         }
         $model = $this->argument('name');
@@ -136,7 +136,7 @@ 
         foreach ($items as $item) {
             $rules[] = $template->with(array_merge(
                 $item,
-                [ 'model' => $model ]
+                ['model' => $model]
             ))->get();
         }
 

src/Commands/ControllerCommand.php

Indentation +16 added lines, -16 removed lines

@@ -5,34 +5,34 @@
 
 class ControllerCommand extends BaseCommand {
 
-	protected $signature = 'wn:controller
+    protected $signature = 'wn:controller
         {model : Name of the model (with namespace if not App)}
 		{--no-routes= : without routes}
         {--force= : override the existing files}
         {--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,
+            ->with([
+                'name' => $controller,
+                'model' => $model,
                 'model_name' => $name
-        	])
-        	->get();
+            ])
+            ->get();
 
         $this->save($content, "./app/Http/Controllers/{$controller}.php", "{$controller}");
         if(! $this->option('no-routes')){

src/Template/TemplateLoader.php

Indentation +19 added lines, -19 removed lines

@@ -7,28 +7,28 @@
 
 class TemplateLoader {
 	
-	protected $fs;
+    protected $fs;
 
-	protected $loaded;
+    protected $loaded;
 
-	public function __construct(Filesystem $fs)
-	{
-		$this->fs = $fs;
-		$this->loaded = [];
-	}
+    public function __construct(Filesystem $fs)
+    {
+        $this->fs = $fs;
+        $this->loaded = [];
+    }
 
-	public function load($name)
-	{
-		if(! isset($this->loaded[$name])){
-			$path = config("lumen-generators.custom_templates.{$name}", __DIR__ . "/../../templates/{$name}.wnt");
+    public function load($name)
+    {
+        if(! isset($this->loaded[$name])){
+            $path = config("lumen-generators.custom_templates.{$name}", __DIR__ . "/../../templates/{$name}.wnt");
 			
-			try {
-				$this->loaded[$name] = $this->fs->get($path);
-			} catch(\Exception $e) {
-				throw new TemplateException("Unable to read the file '{$path}'");
-			}
-		}
-		return new Template($this, $this->loaded[$name]);
-	}
+            try {
+                $this->loaded[$name] = $this->fs->get($path);
+            } catch(\Exception $e) {
+                throw new TemplateException("Unable to read the file '{$path}'");
+            }
+        }
+        return new Template($this, $this->loaded[$name]);
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -19,12 +19,12 @@
 
 	public function load($name)
 	{
-		if(! isset($this->loaded[$name])){
+		if (!isset($this->loaded[$name])) {
 			$path = config("lumen-generators.custom_templates.{$name}", __DIR__ . "/../../templates/{$name}.wnt");
 			
 			try {
 				$this->loaded[$name] = $this->fs->get($path);
-			} catch(\Exception $e) {
+			} catch (\Exception $e) {
 				throw new TemplateException("Unable to read the file '{$path}'");
 			}
 		}