webNeat / lumen-generators

src/Commands/ResourceCommand.php

Doc Comments +3 added lines

@@ -111,6 +111,9 @@
 
     }
 
+    /**
+     * @param string $tag
+     */
     protected function fieldsHavingTag($tag)
     {
         return array_map(function($field){

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php namespace Wn\Generators\Commands;
 
 
-use InvalidArgumentException;
-
 class ResourceCommand extends BaseCommand {
 
     protected $signature = 'wn:resource

Spacing +16 added lines, -16 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' => []
@@ -204,19 +204,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->extractClassName($relation['model'] ? $relation['model'] : $relation['name']))), "name" => snake_case(str_singular($this->extractClassName($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);
@@ -245,12 +245,12 @@ 
 
     protected function factoryFields()
     {
-        return array_map(function($field){
+        return array_map(function($field) {
             return [
                 'name' => $field['name'],
                 'type' => $field['factory']
             ];
-        }, array_filter($this->fields, function($field){
+        }, array_filter($this->fields, function($field) {
             return isset($field['factory']) && $field['factory'];
         }));
     }

src/Template/TemplateLoader.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 
 	public function load($name)
 	{
-		if(! isset($this->loaded[$name])){
+		if (!isset($this->loaded[$name])) {
 			$path = __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}'");
 			}
 		}

Indentation +19 added lines, -19 removed lines

@@ -7,27 +7,27 @@
 
 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 = __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]);
-	}
+    public function load($name)
+    {
+        if(! isset($this->loaded[$name])){
+            $path = __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]);
+    }
 
 }

src/Template/Template.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 
 	public function with($data = [])
 	{
-		if($data)
+		if ($data)
 			$this->dirty = true;
 		foreach ($data as $key => $value) {
 			$this->data[$key] = $value;
@@ -43,7 +43,7 @@ 
 
 	public function get()
 	{
-		if($this->dirty){
+		if ($this->dirty) {
 			$this->compile();
 			$this->dirty = false;
 		}
@@ -53,7 +53,7 @@ 
 	public function compile()
 	{
 		$this->compiled = $this->text;
-		foreach($this->data as $key => $value){
+		foreach ($this->data as $key => $value) {
 			$this->compiled = str_replace('{{' . $key . '}}', $value, $this->compiled);
 		}
 		return $this;

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
 
 	public function with($data = [])
 	{
-		if($data)
-			$this->dirty = true;
+		if($data) {
+					$this->dirty = true;
+		}
 		foreach ($data as $key => $value) {
 			$this->data[$key] = $value;
 		}

Indentation +53 added lines, -53 removed lines

@@ -5,58 +5,58 @@
 
 class Template {
 
-	protected $loader;
-
-	protected $text;
-
-	protected $data;
-
-	protected $compiled;
-
-	protected $dirty;
-
-	public function __construct(TemplateLoader $loader, $text)
-	{
-		$this->loader = $loader;
-		$this->text = $text;
-		$this->compiled = '';
-		$this->data = [];
-		$this->dirty = true;
-	}
-
-	public function clean()
-	{
-		$this->data = [];
-		$this->dirty = false;
-		return $this;
-	}
-
-	public function with($data = [])
-	{
-		if($data)
-			$this->dirty = true;
-		foreach ($data as $key => $value) {
-			$this->data[$key] = $value;
-		}
-		return $this;
-	}
-
-	public function get()
-	{
-		if($this->dirty){
-			$this->compile();
-			$this->dirty = false;
-		}
-		return $this->compiled;
-	}
-
-	public function compile()
-	{
-		$this->compiled = $this->text;
-		foreach($this->data as $key => $value){
-			$this->compiled = str_replace('{{' . $key . '}}', $value, $this->compiled);
-		}
-		return $this;
-	}	
+    protected $loader;
+
+    protected $text;
+
+    protected $data;
+
+    protected $compiled;
+
+    protected $dirty;
+
+    public function __construct(TemplateLoader $loader, $text)
+    {
+        $this->loader = $loader;
+        $this->text = $text;
+        $this->compiled = '';
+        $this->data = [];
+        $this->dirty = true;
+    }
+
+    public function clean()
+    {
+        $this->data = [];
+        $this->dirty = false;
+        return $this;
+    }
+
+    public function with($data = [])
+    {
+        if($data)
+            $this->dirty = true;
+        foreach ($data as $key => $value) {
+            $this->data[$key] = $value;
+        }
+        return $this;
+    }
+
+    public function get()
+    {
+        if($this->dirty){
+            $this->compile();
+            $this->dirty = false;
+        }
+        return $this->compiled;
+    }
+
+    public function compile()
+    {
+        $this->compiled = $this->text;
+        foreach($this->data as $key => $value){
+            $this->compiled = str_replace('{{' . $key . '}}', $value, $this->compiled);
+        }
+        return $this;
+    }	
 
 }

src/Commands/ControllerRestActionsCommand.php

Indentation +2 added lines, -2 removed lines

@@ -3,10 +3,10 @@
 
 class ControllerRestActionsCommand extends BaseCommand {
 
-	protected $signature = 'wn:controller:rest-actions
+    protected $signature = 'wn:controller:rest-actions
 		{--force= : override the existing files}';
 
-	protected $description = 'Generates REST actions trait to use into controllers';
+    protected $description = 'Generates REST actions trait to use into controllers';
 
     public function handle()
     {

src/Commands/SeederCommand.php

Indentation +2 added lines, -2 removed lines

@@ -3,13 +3,13 @@
 
 class SeederCommand extends BaseCommand {
 
-	protected $signature = 'wn:seeder
+    protected $signature = 'wn:seeder
         {model : full qualified name of the model.}
         {--count=10 : number of elements to add in database.}
         {--force= : override the existing files}
     ';
 
-	protected $description = 'Generates a seeder';
+    protected $description = 'Generates a seeder';
 
     public function handle()
     {

src/Commands/FactoryCommand.php

Indentation +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 
 class FactoryCommand extends BaseCommand {
 
-	protected $signature = 'wn:factory
+    protected $signature = 'wn:factory
         {model : full qualified name of the model.}
         {--fields= : the fields to generate.}
         {--file= : the factories file.}
@@ -11,7 +11,7 @@ 
         {--force= : override the existing files}
     ';
 
-	protected $description = 'Generates a model factory';
+    protected $description = 'Generates a model factory';
 
     public function handle()
     {

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

Indentation +2 added lines, -2 removed lines

@@ -3,14 +3,14 @@
 
 class PivotSeederCommand extends BaseCommand {
 
-	protected $signature = 'wn:pivot-seeder
+    protected $signature = 'wn:pivot-seeder
         {model1 : Name of the first model or table}
         {model2 : Name of the second model or table}
         {--count=10 : number of elements to add in database.}
         {--force= : override the existing files}
     ';
 
-	protected $description = 'Generates seeder for pivot table';
+    protected $description = 'Generates seeder for pivot table';
 
     public function handle()
     {

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     }
 
     protected function getSeederName($resources) {
-        $resources = array_map(function($resource){
+        $resources = array_map(function($resource) {
             return ucwords(camel_case($resource));
         }, $resources);
         return implode('', $resources) . 'TableSeeder';

src/Commands/PivotTableCommand.php

Indentation +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 
 class PivotTableCommand extends BaseCommand {
 
-	protected $signature = 'wn:pivot-table
+    protected $signature = 'wn:pivot-table
         {model1 : Name of the first model or table}
         {model2 : Name of the second model or table}
         {--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 pivot table';
+    protected $description = 'Generates creation migration for a pivot table';
 
     protected $tables;
 

Spacing +2 added lines, -2 removed lines

@@ -41,14 +41,14 @@
 
     protected function schema()
     {
-        return implode(' ', array_map(function($table){
+        return implode(' ', array_map(function($table) {
             return $table . '_id:integer:unsigned:index';
         }, $this->tables));
     }
 
     protected function keys()
     {
-        return implode(' ', array_map(function($table){
+        return implode(' ', array_map(function($table) {
             return $table . '_id';
         }, $this->tables));
     }

src/Argument/ArgumentFormatLoader.php

Spacing +5 added lines, -5 removed lines

@@ -19,15 +19,15 @@ 
 
 	public function load($name)
 	{
-    	if(! isset($this->loaded[$name])){
+    	if (!isset($this->loaded[$name])) {
     		$path = __DIR__ . "/../../formats/{$name}.json";
     		$json = "";
 			try {
 				$json = json_decode($this->fs->get($path));
-			} catch(\Exception $e) {
+			} catch (\Exception $e) {
 				throw new ArgumentFormatException("Unable to read the file '{$path}'");
 			}
-			if (json_last_error() !== JSON_ERROR_NONE){
+			if (json_last_error() !== JSON_ERROR_NONE) {
 				throw new ArgumentFormatException("Error while parsing the JSON file '{$path}'");
 			}
 			$this->loaded[$name] = $this->buildFormat($json);
@@ -81,7 +81,7 @@ 
 	    return $format;
 	}
 
-	protected function fillObject($obj, $firstLevel=false)
+	protected function fillObject($obj, $firstLevel = false)
 	{
 	    $format = new ArgumentFormat;
 
@@ -107,7 +107,7 @@ 
 	        if (isset($obj->separator)) {
 	            $format->separator = $obj->separator;
 	        } elseif ($firstLevel) {
-	           $format->separator = ($format->type === 'object') ? ':':',';
+	           $format->separator = ($format->type === 'object') ? ':' : ',';
 	        }
 	    }
 

Indentation +131 added lines, -131 removed lines

@@ -7,140 +7,140 @@
 
 class ArgumentFormatLoader {
 
-	protected $fs;
-
-	protected $loaded;
-
-	public function __construct(Filesystem $fs)
-	{
-		$this->fs = $fs;
-		$this->loaded = [];
-	}
-
-	public function load($name)
-	{
-    	if(! isset($this->loaded[$name])){
-    		$path = __DIR__ . "/../../formats/{$name}.json";
-    		$json = "";
-			try {
-				$json = json_decode($this->fs->get($path));
-			} catch(\Exception $e) {
-				throw new ArgumentFormatException("Unable to read the file '{$path}'");
-			}
-			if (json_last_error() !== JSON_ERROR_NONE){
-				throw new ArgumentFormatException("Error while parsing the JSON file '{$path}'");
-			}
-			$this->loaded[$name] = $this->buildFormat($json);
-		}
-		return $this->loaded[$name];
-	}
-
-	protected function buildFormat($obj)
-	{
-		return $this->fillFirstLevel($obj);
-	}
-
-	protected function fillFirstLevel($obj)
-	{
-	    return $this->fill($obj, true);
-	}
-
-	protected function fill($obj, $firstLevel = false)
-	{
-	    if (is_string($obj)) {
-	        return $this->fillString($obj, $firstLevel);
-	    } else {
-	        return $this->fillObject($obj, $firstLevel);
-	    }
-	}
-
-	protected function fillString($string, $firstLevel = false)
-	{
-	    list($name, $type, $isArray) = $this->parseName($string);
+    protected $fs;
+
+    protected $loaded;
+
+    public function __construct(Filesystem $fs)
+    {
+        $this->fs = $fs;
+        $this->loaded = [];
+    }
+
+    public function load($name)
+    {
+        if(! isset($this->loaded[$name])){
+            $path = __DIR__ . "/../../formats/{$name}.json";
+            $json = "";
+            try {
+                $json = json_decode($this->fs->get($path));
+            } catch(\Exception $e) {
+                throw new ArgumentFormatException("Unable to read the file '{$path}'");
+            }
+            if (json_last_error() !== JSON_ERROR_NONE){
+                throw new ArgumentFormatException("Error while parsing the JSON file '{$path}'");
+            }
+            $this->loaded[$name] = $this->buildFormat($json);
+        }
+        return $this->loaded[$name];
+    }
+
+    protected function buildFormat($obj)
+    {
+        return $this->fillFirstLevel($obj);
+    }
+
+    protected function fillFirstLevel($obj)
+    {
+        return $this->fill($obj, true);
+    }
+
+    protected function fill($obj, $firstLevel = false)
+    {
+        if (is_string($obj)) {
+            return $this->fillString($obj, $firstLevel);
+        } else {
+            return $this->fillObject($obj, $firstLevel);
+        }
+    }
+
+    protected function fillString($string, $firstLevel = false)
+    {
+        list($name, $type, $isArray) = $this->parseName($string);
 	    
-	    $format = new ArgumentFormat;
-	    $format->name = $name;
+        $format = new ArgumentFormat;
+        $format->name = $name;
 	    
-	    if ($isArray) {
-	        $format->type    = 'array';
-	        $subFormat       = new ArgumentFormat;
-	        $subFormat->type = $type ?: 'string';            
-	        $format->format  = $subFormat;
-	    } else {
-	        $format->type = 'string';
-	    }
-
-	    if ($firstLevel) {
-	        if ($format->type === 'object') {
-	            $format->separator = ':';
-	        } elseif ($format->type === 'array') {
-	            $format->separator = ',';
-	        }
-	    }
-
-	    return $format;
-	}
-
-	protected function fillObject($obj, $firstLevel=false)
-	{
-	    $format = new ArgumentFormat;
-
-	    // Resolve type from name
-	    if (isset($obj->name)) {
-	        list($name, $type) = $this->parseName($obj->name);
-	        $format->name = $name;
-	        $format->type = $type;
-	    }
-
-	    // Fill type if set
-	    if (isset($obj->type)) {
-	        $format->type = $obj->type;
-	    }
-
-	    // Fill default if set
-	    if (isset($obj->default)) {
-	        $format->default = $obj->default;
-	    }
+        if ($isArray) {
+            $format->type    = 'array';
+            $subFormat       = new ArgumentFormat;
+            $subFormat->type = $type ?: 'string';            
+            $format->format  = $subFormat;
+        } else {
+            $format->type = 'string';
+        }
+
+        if ($firstLevel) {
+            if ($format->type === 'object') {
+                $format->separator = ':';
+            } elseif ($format->type === 'array') {
+                $format->separator = ',';
+            }
+        }
+
+        return $format;
+    }
+
+    protected function fillObject($obj, $firstLevel=false)
+    {
+        $format = new ArgumentFormat;
+
+        // Resolve type from name
+        if (isset($obj->name)) {
+            list($name, $type) = $this->parseName($obj->name);
+            $format->name = $name;
+            $format->type = $type;
+        }
+
+        // Fill type if set
+        if (isset($obj->type)) {
+            $format->type = $obj->type;
+        }
+
+        // Fill default if set
+        if (isset($obj->default)) {
+            $format->default = $obj->default;
+        }
 	    
-	    // Set separator, default to ':' for objects and ',' for arrays in first level
-	    if (in_array($format->type, ['object', 'array'])) {
-	        if (isset($obj->separator)) {
-	            $format->separator = $obj->separator;
-	        } elseif ($firstLevel) {
-	           $format->separator = ($format->type === 'object') ? ':':',';
-	        }
-	    }
-
-	    // Build format recursively
-	    if (isset($obj->fields)) {
-	        if ($firstLevel) {
-	            if (is_array($obj->fields)) {
-	                $format->format = array_map([$this, 'fillFirstLevel'], $obj->fields);
-	            } else {
-	                $format->format = $this->fill($obj->fields, true);
-	            }
-	        } else {
-	            if (is_array($obj->fields)) {
-	                $format->format = array_map([$this, 'fill'], $obj->fields);
-	            } else {
-	                $format->format = $this->fill($obj->fields);
-	            }
-	        }
-	    }
-
-	    return $format;
-	}
-
-	protected function parseName($name)
-	{
-	    $pattern = '/^(?P<attr>\w+)(\[(?P<type>\w+)?\])?/';
-	    preg_match($pattern, $name, $matches);
-
-	    $attr = $matches['attr'];
-	    $type = empty($matches['type']) ? null : $matches['type'];
-	    $isArray = (isset($matches[2][0]) && $matches[2][0] === '[');
+        // Set separator, default to ':' for objects and ',' for arrays in first level
+        if (in_array($format->type, ['object', 'array'])) {
+            if (isset($obj->separator)) {
+                $format->separator = $obj->separator;
+            } elseif ($firstLevel) {
+                $format->separator = ($format->type === 'object') ? ':':',';
+            }
+        }
+
+        // Build format recursively
+        if (isset($obj->fields)) {
+            if ($firstLevel) {
+                if (is_array($obj->fields)) {
+                    $format->format = array_map([$this, 'fillFirstLevel'], $obj->fields);
+                } else {
+                    $format->format = $this->fill($obj->fields, true);
+                }
+            } else {
+                if (is_array($obj->fields)) {
+                    $format->format = array_map([$this, 'fill'], $obj->fields);
+                } else {
+                    $format->format = $this->fill($obj->fields);
+                }
+            }
+        }
+
+        return $format;
+    }
+
+    protected function parseName($name)
+    {
+        $pattern = '/^(?P<attr>\w+)(\[(?P<type>\w+)?\])?/';
+        preg_match($pattern, $name, $matches);
+
+        $attr = $matches['attr'];
+        $type = empty($matches['type']) ? null : $matches['type'];
+        $isArray = (isset($matches[2][0]) && $matches[2][0] === '[');
 	    
-	    return [$attr, $type, $isArray];
-	}
+        return [$attr, $type, $isArray];
+    }
 
 }