Fixes ccouple of bugs

Author: Mike Alhayek

composer.json

@@ -2,7 +2,7 @@
     "name": "crestapps/laravel-code-generator",
     "license": "MIT",
     "description": "A clean code generator for Laravel framework that will save you time! This awesome tool will help you generate resources like views, controllers, routes, migrations, languages or request-forms! It is extremely flexible and customizable to cover many use cases. It is shipped with cross-browsers compatible template, along with a client-side validation to modernize your application.",
-    "version": "v2.1.0",
+    "version": "v2.1.1",
     "keywords": [
         "laravel","crud","crud generator",
         "laravel crud generator","laravel crud builder",

src/Commands/.php_cs.cache

@@ -1 +1 @@
-{"php":"7.1.1","version":"2.3.1:v2.3.1#d5257f7433bb490299c4f300d95598fd911a8ab0","rules":{"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":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"CreateControllerCommand.php":-928426739,"CreateLanguageCommand.php":-687902967,"FieldsFileCreateCommand.php":-795365111,"CreateModelCommand.php":836566638,"CreateMappedResourcesCommand.php":1155836345,"CreateLayoutCommand.php":1508207172,"CreateIndexViewCommand.php":525196469,"CreateFormViewCommand.php":1554366852,"CreateFormRequestCommand.php":566161834,"CreateFieldsFileCommand.php":1682335243,"CreateEditViewCommand.php":-742651852,"CreateCreateViewCommand.php":724524289,"CreateMigrationCommand.php":-883410323,"FieldsFileReduceCommand.php":956898946,"FieldsFileDeleteCommand.php":427767776,"FieldsFileAppendCommand.php":-1234971934,"CreateViewsCommand.php":177655640,"CreateViewLayoutCommand.php":-694671571,"CreateShowViewCommand.php":-474640776,"CreateRoutesCommand.php":355117204,"CreateResourcesCommand.php":1572191191}}
+{"php":"7.1.6","version":"2.3.2:v2.3.2#597745f744bcce1aed59dfd1bb4603de2a06cda9","rules":{"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":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"CreateControllerCommand.php":-1682517708}}

src/Commands/CreateControllerCommand.php

@@ -611,7 +611,6 @@ protected function getUploadFileMethod(array $fields, $withFormRequest)
      */
     protected function getDestenationFile($name, $path)
     {
-
         if (!empty($path)) {
             $path = Helpers::getPathWithSlash(ucfirst($path));
         }
@@ -629,7 +628,9 @@ protected function getDestenationFile($name, $path)
      */
     protected function getRequestsNamespace($name, $path)
     {
-        $path = str_finish($path, '\\');
+        if (!empty($path)) {
+            $path = str_finish($path, '\\');
+        }
 
         $path = $this->getAppNamespace() . Config::getRequestsPath($path);
 
@@ -700,8 +701,10 @@ protected function makeFormRequest($input)
      */
     protected function getModelNamespace($modelName, $modelDirectory)
     {
-        $modelDirectory = str_finish($modelDirectory, '\\');
-
+        if (!empty($modelDirectory)) {
+            $modelDirectory = str_finish($modelDirectory, '\\');
+        }
+        
         $namespace = $this->getAppNamespace() . Config::getModelsPath($modelDirectory . $modelName);
 
         return rtrim(Helpers::convertSlashToBackslash($namespace), '\\');
@@ -733,9 +736,9 @@ protected function getCommandInput()
         $extends = $this->generatorOption('controller-extends');
         $withAuth = $this->option('with-auth');
 
-        return (object) compact('formRequestDirectory','viewDirectory', 'viewName', 'modelName', 'prefix', 'perPage', 'fileSnippet', 'modelDirectory',
+        return (object) compact('formRequestDirectory', 'viewDirectory', 'viewName', 'modelName', 'prefix', 'perPage', 'fileSnippet', 'modelDirectory',
                                 'langFile', 'fields', 'withFormRequest', 'formRequestName', 'force', 'fieldsFile', 'template',
-                                'controllerName', 'extends', 'withAuth','controllerDirectory');
+                                'controllerName', 'extends', 'withAuth', 'controllerDirectory');
     }
 
     /**

src/Commands/CreateMappedResourcesCommand.php

@@ -36,6 +36,7 @@ class CreateMappedResourcesCommand extends Command
                             {--table-exists : This option will attempt to fetch the field from existing database table.}
                             {--primary-key=id : The name of the primary key.}
                             {--translation-for= : A comma seperated string of languages to create fields for.}
+                            {--form-request-directory= : The directory of the form-request.}
                             {--mapping-filename= : The name of the resource mapping file.}
                             {--force : This option will override the controller if one already exists.}';
 

src/Commands/CreateMigrationCommand.php

@@ -831,7 +831,7 @@ protected function getCommandInput()
         $modelName = trim($this->argument('model-name'));
         $madeUpTableName = $this->makeTableName($modelName);
         $tableName = trim($this->option('table-name')) ?: $madeUpTableName;
-        $className = trim($this->option('migration-class-name')) ?: sprintf('Create%sTable', $madeUpTableName);
+        $className = trim($this->option('migration-class-name')) ?: sprintf('Create%sTable', studly_case($madeUpTableName));
         $connection =  trim($this->option('connection-name'));
         $engine =  trim($this->option('engine-name'));
         $fields = trim($this->option('fields'));