webNeat / lumen-generators

src/Commands/ControllerCommand.php

Indentation +16 added lines, -16 removed lines

@@ -3,32 +3,32 @@
 
 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}
     ';
 
-	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
-        	])
-        	->get();
+            ->with([
+                'name' => $controller,
+                'model' => $model
+            ])
+            ->get();
 
         $this->save($content, "./app/Http/Controllers/{$controller}.php", "{$controller}");
 

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
     {
     	$model = $this->argument('model');
     	$name = '';
-    	if(strrpos($model, "\\") === false){
+    	if (strrpos($model, "\\") === false) {
     		$name = $model;
     		$model = "App\\" . $model;
     	} else {
@@ -32,7 +32,7 @@ 
 
         $this->save($content, "./app/Http/Controllers/{$controller}.php", "{$controller}");
 
-        if(! $this->option('no-routes')){
+        if (!$this->option('no-routes')) {
             $this->call('wn:route', [
                 'resource' => snake_case($name, '-'),
                 '--controller' => $controller

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 +4 added lines, -4 removed lines

@@ -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/Commands/MigrationCommand.php

Indentation +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 
 class MigrationCommand extends BaseCommand {
 
-	protected $signature = 'wn:migration
+    protected $signature = 'wn:migration
         {table : The table name.}
         {--schema= : the schema.}
         {--add= : specifies additional columns like timestamps, softDeletes, rememberToken and nullableTimestamps.}
@@ -15,7 +15,7 @@ 
         // {action : One of create, add, remove or drop options.}
         // The action is only create for the moment
 
-	protected $description = 'Generates a migration to create a table with schema';
+    protected $description = 'Generates a migration to create a table with schema';
 
     public function handle()
     {

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
             ->get();
 
         $file = $this->option('file');
-        if(! $file){
+        if (!$file) {
             $file = date('Y_m_d_His_') . snake_case($name) . '_table';
         }
 
@@ -43,12 +43,12 @@ 
     protected function getSchema()
     {
         $schema = $this->option('schema');
-        if(! $schema){
+        if (!$schema) {
             return $this->spaces(12) . "// Schema declaration";
         }
 
         $items = $schema;
-        if( ! $this->option('parsed')){
+        if (!$this->option('parsed')) {
             $items = $this->getArgumentParser('schema')->parse($schema);
         }
 
@@ -82,7 +82,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) . ';';
@@ -91,12 +91,12 @@ 
     protected function getConstraints()
     {
         $keys = $this->option('keys');
-        if(! $keys){
+        if (!$keys) {
             return $this->spaces(12) . "// Constraints declaration";
         }
 
         $items = $keys;
-        if(! $this->option('parsed')){
+        if (!$this->option('parsed')) {
             $items = $this->getArgumentParser('foreign-keys')->parse($keys);
         }
 
@@ -110,10 +110,10 @@ 
 
     protected function getConstraintDeclaration($key)
     {
-        if(! $key['column']){
+        if (!$key['column']) {
             $key['column'] = 'id';
         }
-        if(! $key['table']){
+        if (!$key['table']) {
             $key['table'] = str_plural(substr($key['name'], 0, count($key['name']) - 4));
         }
 
@@ -125,7 +125,7 @@ 
             ])
             ->get();
 
-        if($key['on_delete']){
+        if ($key['on_delete']) {
             $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint')
                 ->with([
                     'event' => 'Delete',
@@ -134,7 +134,7 @@ 
                 ->get();
         }
 
-        if($key['on_update']){
+        if ($key['on_update']) {
             $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint')
                 ->with([
                     'event' => 'Update',

src/CommandsServiceProvider.php

Spacing +24 added lines, -24 removed lines

@@ -21,85 +21,85 @@
         // $this->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 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/Argument/ArgumentFormatLoader.php

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 = (@$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 = (@$matches[2][0] === '[');
 	    
-	    return [$attr, $type, $isArray];
-	}
+        return [$attr, $type, $isArray];
+    }
 
 }
\ No newline at end of file

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') ? ':' : ',';
 	        }
 	    }
 

src/Argument/ArgumentParser.php

Indentation +105 added lines, -105 removed lines

@@ -6,110 +6,110 @@
 
 class ArgumentParser {
 
-	protected $format;
-
-	public function __construct(ArgumentFormat $format)
-	{
-	    $this->format = $format;
-	}
-
-	public function parse($args)
-	{
-		return $this->parseToken($args, $this->format);
-	}
-
-	protected function parseToken($token, ArgumentFormat $format){
-	    switch($format->type) {
-	        case 'string':
-	            return $token;
-	        case 'number':
-	            return $this->parseNumber($token);
-	        case 'boolean':
-	            return $this->parseBoolean($token, $format->name);
-	        case 'array':
-	            return $this->parseArray($token, $format->separator, $format->format);
-	        case 'object':
-	            return $this->parseObject($token, $format->separator, $format->format);
-	        default:
-	            throw new ArgumentParserException("Unknown format type: '{$format->type}'");
-	    }
-	}
-
-	protected function parseNumber($token)
-	{
-	    if(! is_numeric($token)) {
-	        throw new ArgumentParserException("Unable to parse '{$token}' as number");
-	    }
-	    return $token + 0;
-	}
-
-	protected function parseBoolean($token, $name)
-	{
-	    if(in_array($token, ['yes', 'true', '1', $name])) {
-	        return true;
-	    } else if(in_array($token, ['no', 'false', '0', "!{$name}"])){
-	        return false;
-	    } else {
-	        return null;
-	    }
-	}
-
-	protected function parseArray($token, $separator, ArgumentFormat $format)
-	{
-	    $result = [];
-	    $tokens = explode($separator, $token);
-	    foreach($tokens as $value) {
-	        array_push($result, $this->parseToken($value, $format));
-	    }
-	    return $result;
-	}
-
-	protected function parseObject($token, $separator, $fields)
-	{
-	    $result = [];
-	    $tokens = explode($separator, $token);
-	    $tokensNumber = count($tokens);
-
-	    $requiredFieldsIndexes = [];
-	    $optionalFieldsIndexes = [];
-	    foreach($fields as $index => $format) {
-	        if($format->default === null) {
-	            array_push($requiredFieldsIndexes, $index);
-	        } else {
-	            array_push($optionalFieldsIndexes, $index);
-	        }
-	    }
-	    $requiredFieldsIndexesNumber = count($requiredFieldsIndexes);
-
-	    if($tokensNumber < $requiredFieldsIndexesNumber) {
-	        $requiredFields = array_map(function($index) use ($fields) {
-	                return $fields[$index]->name;
-	            }, $requiredFieldsIndexes);
-	        $requiredFields = implode($separator, $requiredFields);
-	        throw new ArgumentParserException("Required field missing: {$tokensNumber} given "
-	            . "({$token}) but {$requiredFieldsIndexesNumber} required ({$requiredFields})");
-	    }
-
-	    $givenOptionalFieldsIndexes = array_slice(
-	        $optionalFieldsIndexes, 0, $tokensNumber - $requiredFieldsIndexesNumber);
-	    $notPresentFieldsIndexes = array_slice(
-	        $optionalFieldsIndexes, $tokensNumber - $requiredFieldsIndexesNumber);
-	    $givenFieldsIndexes = array_merge($requiredFieldsIndexes, $givenOptionalFieldsIndexes);
-	    sort($givenFieldsIndexes);
-
-	    // Fill the given fields
-	    for($i = 0; $i < $tokensNumber; $i ++) {
-	        $fieldFormat = $fields[$givenFieldsIndexes[$i]];
-	        $result[$fieldFormat->name] = $this->parseToken($tokens[$i], $fieldFormat);
-	    }
-
-	    // Fill other fields with default values
-	    foreach($notPresentFieldsIndexes as $index) {
-	        $fieldFormat = $fields[$index];
-	        $result[$fieldFormat->name] = $fieldFormat->default;
-	    }
-
-	    return $result;
-	}
+    protected $format;
+
+    public function __construct(ArgumentFormat $format)
+    {
+        $this->format = $format;
+    }
+
+    public function parse($args)
+    {
+        return $this->parseToken($args, $this->format);
+    }
+
+    protected function parseToken($token, ArgumentFormat $format){
+        switch($format->type) {
+            case 'string':
+                return $token;
+            case 'number':
+                return $this->parseNumber($token);
+            case 'boolean':
+                return $this->parseBoolean($token, $format->name);
+            case 'array':
+                return $this->parseArray($token, $format->separator, $format->format);
+            case 'object':
+                return $this->parseObject($token, $format->separator, $format->format);
+            default:
+                throw new ArgumentParserException("Unknown format type: '{$format->type}'");
+        }
+    }
+
+    protected function parseNumber($token)
+    {
+        if(! is_numeric($token)) {
+            throw new ArgumentParserException("Unable to parse '{$token}' as number");
+        }
+        return $token + 0;
+    }
+
+    protected function parseBoolean($token, $name)
+    {
+        if(in_array($token, ['yes', 'true', '1', $name])) {
+            return true;
+        } else if(in_array($token, ['no', 'false', '0', "!{$name}"])){
+            return false;
+        } else {
+            return null;
+        }
+    }
+
+    protected function parseArray($token, $separator, ArgumentFormat $format)
+    {
+        $result = [];
+        $tokens = explode($separator, $token);
+        foreach($tokens as $value) {
+            array_push($result, $this->parseToken($value, $format));
+        }
+        return $result;
+    }
+
+    protected function parseObject($token, $separator, $fields)
+    {
+        $result = [];
+        $tokens = explode($separator, $token);
+        $tokensNumber = count($tokens);
+
+        $requiredFieldsIndexes = [];
+        $optionalFieldsIndexes = [];
+        foreach($fields as $index => $format) {
+            if($format->default === null) {
+                array_push($requiredFieldsIndexes, $index);
+            } else {
+                array_push($optionalFieldsIndexes, $index);
+            }
+        }
+        $requiredFieldsIndexesNumber = count($requiredFieldsIndexes);
+
+        if($tokensNumber < $requiredFieldsIndexesNumber) {
+            $requiredFields = array_map(function($index) use ($fields) {
+                    return $fields[$index]->name;
+                }, $requiredFieldsIndexes);
+            $requiredFields = implode($separator, $requiredFields);
+            throw new ArgumentParserException("Required field missing: {$tokensNumber} given "
+                . "({$token}) but {$requiredFieldsIndexesNumber} required ({$requiredFields})");
+        }
+
+        $givenOptionalFieldsIndexes = array_slice(
+            $optionalFieldsIndexes, 0, $tokensNumber - $requiredFieldsIndexesNumber);
+        $notPresentFieldsIndexes = array_slice(
+            $optionalFieldsIndexes, $tokensNumber - $requiredFieldsIndexesNumber);
+        $givenFieldsIndexes = array_merge($requiredFieldsIndexes, $givenOptionalFieldsIndexes);
+        sort($givenFieldsIndexes);
+
+        // Fill the given fields
+        for($i = 0; $i < $tokensNumber; $i ++) {
+            $fieldFormat = $fields[$givenFieldsIndexes[$i]];
+            $result[$fieldFormat->name] = $this->parseToken($tokens[$i], $fieldFormat);
+        }
+
+        // Fill other fields with default values
+        foreach($notPresentFieldsIndexes as $index) {
+            $fieldFormat = $fields[$index];
+            $result[$fieldFormat->name] = $fieldFormat->default;
+        }
+
+        return $result;
+    }
 
 }
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -18,8 +18,8 @@ 
 		return $this->parseToken($args, $this->format);
 	}
 
-	protected function parseToken($token, ArgumentFormat $format){
-	    switch($format->type) {
+	protected function parseToken($token, ArgumentFormat $format) {
+	    switch ($format->type) {
 	        case 'string':
 	            return $token;
 	        case 'number':
@@ -37,7 +37,7 @@ 
 
 	protected function parseNumber($token)
 	{
-	    if(! is_numeric($token)) {
+	    if (!is_numeric($token)) {
 	        throw new ArgumentParserException("Unable to parse '{$token}' as number");
 	    }
 	    return $token + 0;
@@ -45,9 +45,9 @@ 
 
 	protected function parseBoolean($token, $name)
 	{
-	    if(in_array($token, ['yes', 'true', '1', $name])) {
+	    if (in_array($token, ['yes', 'true', '1', $name])) {
 	        return true;
-	    } else if(in_array($token, ['no', 'false', '0', "!{$name}"])){
+	    } else if (in_array($token, ['no', 'false', '0', "!{$name}"])) {
 	        return false;
 	    } else {
 	        return null;
@@ -58,7 +58,7 @@ 
 	{
 	    $result = [];
 	    $tokens = explode($separator, $token);
-	    foreach($tokens as $value) {
+	    foreach ($tokens as $value) {
 	        array_push($result, $this->parseToken($value, $format));
 	    }
 	    return $result;
@@ -72,8 +72,8 @@ 
 
 	    $requiredFieldsIndexes = [];
 	    $optionalFieldsIndexes = [];
-	    foreach($fields as $index => $format) {
-	        if($format->default === null) {
+	    foreach ($fields as $index => $format) {
+	        if ($format->default === null) {
 	            array_push($requiredFieldsIndexes, $index);
 	        } else {
 	            array_push($optionalFieldsIndexes, $index);
@@ -81,7 +81,7 @@ 
 	    }
 	    $requiredFieldsIndexesNumber = count($requiredFieldsIndexes);
 
-	    if($tokensNumber < $requiredFieldsIndexesNumber) {
+	    if ($tokensNumber < $requiredFieldsIndexesNumber) {
 	        $requiredFields = array_map(function($index) use ($fields) {
 	                return $fields[$index]->name;
 	            }, $requiredFieldsIndexes);
@@ -98,13 +98,13 @@ 
 	    sort($givenFieldsIndexes);
 
 	    // Fill the given fields
-	    for($i = 0; $i < $tokensNumber; $i ++) {
+	    for ($i = 0; $i < $tokensNumber; $i++) {
 	        $fieldFormat = $fields[$givenFieldsIndexes[$i]];
 	        $result[$fieldFormat->name] = $this->parseToken($tokens[$i], $fieldFormat);
 	    }
 
 	    // Fill other fields with default values
-	    foreach($notPresentFieldsIndexes as $index) {
+	    foreach ($notPresentFieldsIndexes as $index) {
 	        $fieldFormat = $fields[$index];
 	        $result[$fieldFormat->name] = $fieldFormat->default;
 	    }