=Fixes multiple bugs in the html. Improves html template and validation rules. Switches to a PSR-2 coding style.

Author: malhayek2014

config/.php_cs.cache

@@ -0,0 +1 @@
+{"php":"5.6.24","version":"2.1.2:","rules":{"encoding":true,"full_opening_tag":true,"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":["property"],"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true},"hashes":{"codegenerator.php":570438976}}

src/.php_cs.cache

@@ -0,0 +1 @@
+{"php":"5.6.24","version":"2.1.2:","rules":{"encoding":true,"full_opening_tag":true,"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":["property"],"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true},"hashes":{"CodeGeneratorServiceProvider.php":-1685777146}}

src/CodeGeneratorServiceProvider.php

@@ -72,8 +72,7 @@ public function register()
      */
     protected function createDirectory($path, $mode = '0777')
     {
-        if(!file_exists($path))
-        {
+        if (!file_exists($path)) {
             mkdir($path, $mode);
         }
     }

src/Commands/.php_cs.cache

@@ -0,0 +1 @@
+{"php":"5.6.24","version":"2.1.2:","rules":{"encoding":true,"full_opening_tag":true,"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":["property"],"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true},"hashes":{"CreateControllerCommand.php":1979890676,"CreateCreateViewCommand.php":131691758,"CreateEditViewCommand.php":1171483022,"CreateFieldsFileCommand.php":1361178139,"CreateFormRequestCommand.php":194589446,"CreateFormViewCommand.php":623765643,"CreateIndexViewCommand.php":-1734787902,"CreateLanguageCommand.php":-1844147042,"CreateLayoutCommand.php":396331127,"CreateMigrationCommand.php":1405553898,"CreateModelCommand.php":-1793560043,"CreateResourcesCommand.php":-1298335991,"CreateRoutesCommand.php":1075556265,"CreateShowViewCommand.php":2103655095,"CreateViewLayoutCommand.php":213476386,"CreateViewsCommand.php":-986690200}}

src/Commands/CreateControllerCommand.php

@@ -51,7 +51,7 @@ class CreateControllerCommand extends GeneratorCommand
      */
     protected function getStub()
     {
-        return $this->getStubByName('controller', $this->getTemplateName() );
+        return $this->getStubByName('controller', $this->getTemplateName());
     }
 
     /**
@@ -68,8 +68,7 @@ protected function buildClass($name)
 
         $formRequestName = 'Request';
 
-        if($input->formRequest)
-        {
+        if ($input->formRequest) {
             $stub = $this->getStubContent('controller-with-form-request', $input->template);
             $formRequestName = $input->formRequestName;
             $this->makeFormRequest($input);
@@ -100,8 +99,7 @@ protected function buildClass($name)
      */
     protected function getUploadFileMethod(array $fields)
     {
-        if($this->isContainfile($fields))
-        {
+        if ($this->isContainfile($fields)) {
             return $this->getStubContent('controller-upload-method', $this->getTemplateName());
         }
 
@@ -129,7 +127,7 @@ protected function getRequestsNamespace()
      */
     protected function isContainMultipleAnswers(array $fields)
     {
-        $filtered = array_filter($fields, function($field){
+        $filtered = array_filter($fields, function ($field) {
             return $field->isMultipleAnswers;
         });
 
@@ -145,7 +143,7 @@ protected function isContainMultipleAnswers(array $fields)
      */
     protected function makeFormRequest($input)
     {
-        $this->callSilent('create:form-request', 
+        $this->callSilent('create:form-request',
         [
             'class-name' => $input->formRequestName,
             '--fields' => $input->fields,
@@ -169,7 +167,7 @@ protected function getModelFullName($path, $name)
     {
         $final = !empty($path) ? $this->getModelsPath() . Helpers::getPathWithSlash($path) : $this->getModelsPath();
 
-        return Helpers::convertSlashToBackslash($final . ucfirst($name));
+        return Helpers::convertSlashToBackslash($final . $name);
     }
 
     /**
@@ -180,7 +178,9 @@ protected function getModelFullName($path, $name)
     protected function getCommandInput()
     {
         $controllerName = trim($this->argument('controller-name'));
-        $modelName = strtolower(trim($this->option('model-name')) ?: str_singular(Helpers::removePostFixWith($controllerName, 'Controller')));
+        $plainControllerName = str_singular(Helpers::removePostFixWith($controllerName, 'Controller'));
+
+        $modelName = trim($this->option('model-name')) ?: $plainControllerName;
         $viewDirectory = trim($this->option('views-directory'));
         $prefix = trim($this->option('routes-prefix'));
         $perPage = intval($this->option('models-per-page'));
@@ -190,11 +190,11 @@ protected function getCommandInput()
         $formRequest = $this->option('with-form-request');
         $force = $this->option('force');
         $modelDirectory = trim($this->option('model-directory'));
-        $formRequestName = ucfirst($modelName) . 'FormRequest';
+        $formRequestName = $plainControllerName . 'FormRequest';
         $template = $this->getTemplateName();
 
-        return (object) compact('viewDirectory','viewName','modelName','prefix','perPage','fileSnippet','modelDirectory',
-                                'langFile','fields','formRequest','formRequestName','force','fieldsFile','template');
+        return (object) compact('viewDirectory', 'viewName', 'modelName', 'prefix', 'perPage', 'fileSnippet', 'modelDirectory',
+                                'langFile', 'fields', 'formRequest', 'formRequestName', 'force', 'fieldsFile', 'template');
     }
 
     /**
@@ -328,8 +328,7 @@ public function getNameInput()
         $path = $this->getControllersPath();
         $directory = trim($this->option('controller-directory'));
 
-        if(!empty($directory))
-        {
+        if (!empty($directory)) {
             $path .= Helpers::getPathWithSlash($directory);
         }
 
@@ -347,16 +346,13 @@ protected function getFileReadySnippet(array $fields)
     {
         $code = '';
 
-        foreach($fields as $field)
-        {
-            if($field->isFile())
-            {
+        foreach ($fields as $field) {
+            if ($field->isFile()) {
                 $code = ($code) ?: '$this';
                 $code .= sprintf("->uploadFile('%s', \$data)", $field->name);
             }
         }
 
         return $code != '' ? $code . ';' : $code;
     }
-
 }

src/Commands/CreateCreateViewCommand.php

@@ -52,16 +52,13 @@ protected function handleCreateView()
         $fields = $this->getFields($input->fields, $input->languageFileName, $input->fieldsFile);
         $destenationFile = $this->getDestinationViewFullname($input->viewsDirectory, $input->prefix, 'create');
 
-        if($this->canCreateView($destenationFile, $input->force))
-        {
+        if ($this->canCreateView($destenationFile, $input->force)) {
             $this->createLanguageFile($input->languageFileName, $input->fields, $input->fieldsFile)
                  ->createMissingViews($input)
                  ->replaceCommonTemplates($stub, $input)
                  ->replaceFileUpload($stub, $fields)
                  ->createViewFile($stub, $destenationFile)
                  ->info('Create view was crafted successfully.');
         }
-
     }
-
 }

src/Commands/CreateEditViewCommand.php

@@ -52,8 +52,7 @@ protected function handleCreateView()
         $fields = $this->getFields($input->fields, $input->languageFileName, $input->fieldsFile);
         $destenationFile = $this->getDestinationViewFullname($input->viewsDirectory, $input->prefix, 'edit');
 
-        if($this->canCreateView($destenationFile, $input->force, $fields))
-        {
+        if ($this->canCreateView($destenationFile, $input->force, $fields)) {
             $this->createLanguageFile($input->languageFileName, $input->fields, $input->fieldsFile)
                  ->createMissingViews($input)
                  ->replaceCommonTemplates($stub, $input)
@@ -64,6 +63,4 @@ protected function handleCreateView()
                  ->info('Edit view view was crafted successfully.');
         }
     }
-
-
 }

src/Commands/CreateFieldsFileCommand.php

@@ -47,13 +47,11 @@ class CreateFieldsFileCommand extends Command
      */
     public function handle()
     {
-        if(File::exists($this->getDestinationFullname()) && !$this->isForce())
-        {
-            throw new Exception('The file ' . $this->getFilename() . ' already exists. To override it try passing the --force option to override it.' );
+        if (File::exists($this->getDestinationFullname()) && !$this->isForce()) {
+            throw new Exception('The file ' . $this->getFilename() . ' already exists. To override it try passing the --force option to override it.');
         }
 
-        if(!$this->createFile($this->getDestinationFullname(), $this->getFieldAsJson()))
-        {
+        if (!$this->createFile($this->getDestinationFullname(), $this->getFieldAsJson())) {
             throw new Exception('Something went wrong while trying to create the fields file.');
         }
 
@@ -68,7 +66,7 @@ public function handle()
      */
     protected function getFieldAsJson()
     {
-        $fields =  array_map(function($field){
+        $fields =  array_map(function ($field) {
             return $field->toArray();
         }, $this->getFields());
 
@@ -109,8 +107,7 @@ protected function getFields()
     {
         $driver = strtolower(DB::getDriverName());
 
-        if(!in_array($driver, $this->drivers))
-        {
+        if (!in_array($driver, $this->drivers)) {
             throw new Exception('The database driver user is not supported!');
         }
 

src/Commands/CreateFormRequestCommand.php

@@ -24,7 +24,6 @@ class CreateFormRequestCommand extends Command
                             {--template-name= : The template name to use when generating the code.}
                             {--force : This option will override the form-request if one already exists.}';
 
-
     /**
      * The console command description.
      *
@@ -72,15 +71,13 @@ protected function makeFile($fileFullname, $stub, $force = false)
     {
         $this->createDirectory(dirname($fileFullname));
 
-        if(File::exists($fileFullname) && !$force)
-        {
+        if (File::exists($fileFullname) && !$force) {
             throw new Exception('There is a form-request class with the same name! To override existing file try passing "--force" command');
         }
 
-        if(! File::put($fileFullname, $stub))
-        {
+        if (! File::put($fileFullname, $stub)) {
             throw new Exception('New form-request have been created');
-        } 
+        }
 
         $this->error('The form-request failed to create');
 
@@ -100,7 +97,7 @@ protected function getCommandInput()
         $force = $this->option('force');
         $template = $this->option('template-name');
 
-        return (object) compact('fileName','fields','fieldsFile','force','template');
+        return (object) compact('fileName', 'fields', 'fieldsFile', 'force', 'template');
     }
 
     /**

src/Commands/CreateFormViewCommand.php

@@ -48,15 +48,13 @@ public function __construct()
      */
     protected function handleCreateView()
     {
-
         $input = $this->getCommandInput();
         $stub = $this->getStubContent($this->stubName);
         $fields = $this->getFields($input->fields, $input->languageFileName, $input->fieldsFile);
         $destenationFile = $this->getDestinationViewFullname($input->viewsDirectory, $input->prefix, 'form');
-        $htmlCreator = $this->getHtmlGenerator($fields, $input->modelName ,$this->getTemplateName());
+        $htmlCreator = $this->getHtmlGenerator($fields, $input->modelName, $this->getTemplateName());
 
-        if($this->canCreateView($destenationFile, $input->force))
-        {
+        if ($this->canCreateView($destenationFile, $input->force)) {
             $this->createLanguageFile($input->languageFileName, $input->fields, $input->fieldsFile)
                  ->replaceCommonTemplates($stub, $input)
                  ->replaceFields($stub, $htmlCreator->getHtmlFields())
@@ -79,5 +77,4 @@ protected function replaceFields(&$stub, $fields)
 
         return $this;
     }
-
 }