Fix #108, #109, and #110

Author: MikeAlhayek

composer.json

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

src/Commands/Api/CreateApiScaffoldCommand.php

@@ -26,7 +26,7 @@ class CreateApiScaffoldCommand extends CreateScaffoldCommandBase
                             {--controller-directory= : The directory where the controller should be created under. }
                             {--controller-extends=default-controller : The base controller to be extend.}
                             {--model-directory= : The path of the model.}
-                            {--views-directory= : The name of the view path.}
+							{--model-extends=default-model : The base model to be extend.}
                             {--form-request-directory= : The directory of the form-request.}
                             {--resource-file= : The name of the resource-file to import from.}
                             {--fields= : If the resource-file does not exists, passing list of fields here will create it first.}
@@ -114,7 +114,7 @@ protected function createController(ApiScaffoldInput $input)
                     '--models-per-page' => $input->perPage,
                     '--routes-prefix' => $input->prefix,
                     '--language-filename' => $input->languageFileName,
-                    '--with-form-request' => $input->formRequest,
+                    '--with-form-request' => $input->withFormRequest,
                     '--without-form-request' => $this->option('without-form-request'),
                     '--form-request-directory' => $input->formRequestDirectory,
                     '--with-auth' => $input->withAuth,

src/Commands/Bases/CreateScaffoldCommandBase.php

@@ -210,7 +210,6 @@ protected function getCommandInput()
         $input->withoutModel = $this->option('without-model');
         $input->withoutController = $this->option('without-controller');
         $input->withoutFormRequest = $this->option('without-form-request');
-        $input->withoutViews = $this->option('without-views');
         $input->migrationClass = $this->option('migration-class-name');
         $input->connectionName = $this->option('connection-name');
         $input->engineName = $this->option('engine-name');

src/Commands/Framework/CreateScaffoldCommand.php

@@ -179,6 +179,8 @@ protected function getCommandInput()
         $input = new ScaffoldInput(parent::getCommandInput());
 
         $input->viewsDirectory = trim($this->option('views-directory'));
+		$input->withoutViews = $this->option('without-views');
+		
         $input->layoutName = $this->option('layout-name') ?: 'layouts.app';
 
         return $input;

src/Models/Field.php

@@ -1140,7 +1140,7 @@ public function getOnAction($action)
      */
     public function setDataTypeParams(array $properties)
     {
-        if (Arr::isKeyExists($properties, 'data-type-params') && is_array($properties['data-type-params'])) {
+        if (Arr::isKeyExists($properties, 'data-type-params')) {
             $this->methodParams = $this->getDataTypeParams((array) $properties['data-type-params']);
         }
 

src/Models/ForeignRelationship.php

@@ -67,7 +67,7 @@ class ForeignRelationship implements JsonWriter
     public function __construct($type, $parameters, $name, $field = null)
     {
         $this->setType($type);
-        $this->setParameters((array) $parameters);
+        $this->setParameters($parameters);
         $this->name = $name;
         $this->setField($field);
     }
@@ -77,10 +77,16 @@ public function __construct($type, $parameters, $name, $field = null)
      *
      * @return void
      */
-    public function setParameters(array $parameters)
+    public function setParameters($parameters)
     {
         $this->parameters = [];
 
+        $this->parameters = [];
+		
+        if(!is_array($parameters)){
+            $parameters = Arr::fromString($parameters, '|');
+        }
+		
         foreach ($parameters as $parameter) {
             $this->parameters[] = Str::eliminateDupilcates($parameter, "\\");
         }
@@ -424,8 +430,19 @@ public function toArray()
     public static function get(array $options)
     {
         if (!self::isValid($options)) {
-            return null;
-        }
+			if(count($options) >= 3) {
+				$values = array_values($options);
+				$field = isset($values[3]) ? $values[3] : null;
+				return new ForeignRelationship(
+					$values[1],
+					$values[2],
+					$values[0],
+					$field
+				);				
+			}
+			
+			return null;
+		}
 
         $field = array_key_exists('field', $options) ? $options['field'] : null;
 

src/Support/Arr.php

@@ -45,9 +45,9 @@ public static function wrapItems(array $items, $wrapper = "'")
      *
      * @return array
      */
-    public static function fromString($str, $seperator = ',')
+    public static function fromString($str, $seperator = ',', $limit = PHP_INT_MAX)
     {
-        return self::removeEmptyItems(explode($seperator, $str), function ($param) {
+        return self::removeEmptyItems(explode($seperator, $str, $limit ), function ($param) {
             return Str::trimQuots($param);
         });
     }