Make it compatible with Laravel 6+

MikeAlhayek · MikeAlhayek · commit 95e95dbaa203 · 2019-11-03T17:38:35.000-08:00
diff --git a/composer.json b/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.3",
+    "version": "2.4.0",
     "keywords": [
         "laravel","crud","crud generator",
         "laravel crud generator","laravel crud builder",
diff --git a/src/Commands/ApiDocs/CreateApiDocsControllerCommand.php b/src/Commands/ApiDocs/CreateApiDocsControllerCommand.php
@@ -261,7 +261,7 @@ protected function getCommandInput()
     {
         $modelName = trim($this->argument('model-name'));
         $cName = trim($this->option('controller-name'));
-        $controllerName = $cName ? str_finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);
+        $controllerName = $cName ? Str::finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);
         $prefix = ($this->option('routes-prefix') == 'default-form') ? Helpers::makeRouteGroup($modelName) : $this->option('routes-prefix');
         $resourceFile = trim($this->option('resource-file')) ?: Helpers::makeJsonFileName($modelName);
         $force = $this->option('force');
diff --git a/src/Commands/ApiDocs/CreateApiDocsViewCommand.php b/src/Commands/ApiDocs/CreateApiDocsViewCommand.php
@@ -319,22 +319,22 @@ protected function getValidationRules(Field $field)
                 continue;
             }
 
-            if ($hasString && starts_with($rule, 'min:')) {
+            if ($hasString && Str::startsWith($rule, 'min:')) {
                 $rules[] = 'Minimum Length: ' . Str::trimEnd($rule, 'min:');
                 continue;
             }
 
-            if ($hasString && starts_with($rule, 'max:')) {
+            if ($hasString && Str::startsWith($rule, 'max:')) {
                 $rules[] = 'Maximum Length: ' . Str::trimEnd($rule, 'max:');
                 continue;
             }
 
-            if ($hasNumber && starts_with($rule, 'min:')) {
+            if ($hasNumber && Str::startsWith($rule, 'min:')) {
                 $rules[] = 'Minimum Value: ' . Str::trimEnd($rule, 'min:');
                 continue;
             }
 
-            if ($hasNumber && starts_with($rule, 'max:')) {
+            if ($hasNumber && Str::startsWith($rule, 'max:')) {
                 $rules[] = 'Maximum Value: ' . Str::trimEnd($rule, 'max:');
                 continue;
             }
@@ -548,7 +548,7 @@ protected function getCommandInput()
     {
         $modelName = trim($this->argument('model-name'));
         $cName = trim($this->option('controller-name'));
-        $controllerName = $cName ? str_finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);
+        $controllerName = $cName ? Str::finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);
         $controllerDirectory = trim($this->option('controller-directory'));
         $viewsDirectory = trim($this->option('views-directory'));
         $layoutName = trim($this->option('layout-name'));
diff --git a/src/Commands/Bases/ControllerCommandBase.php b/src/Commands/Bases/ControllerCommandBase.php
@@ -183,7 +183,7 @@ protected function getCommandInput()
     {
         $modelName = trim($this->argument('model-name'));
         $cName = trim($this->option('controller-name'));
-        $controllerName = $cName ? str_finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);
+        $controllerName = $cName ? Str::finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);
         $prefix = ($this->option('routes-prefix') == 'default-form') ? Helpers::makeRouteGroup($modelName) : $this->option('routes-prefix');
         $perPage = intval($this->option('models-per-page'));
         $resourceFile = trim($this->option('resource-file')) ?: Helpers::makeJsonFileName($modelName);
@@ -486,7 +486,7 @@ protected function getRelationCollections(array $fields, $view)
     protected function getRequestsNamespace($name, $path)
     {
         if (!empty($path)) {
-            $path = str_finish($path, '\\');
+            $path = Str::finish($path, '\\');
         }
 
         $path = Helpers::getAppNamespace() . Config::getRequestsPath($path);
diff --git a/src/Commands/Bases/ControllerRequestCommandBase.php b/src/Commands/Bases/ControllerRequestCommandBase.php
@@ -8,6 +8,7 @@
 use CrestApps\CodeGenerator\Traits\CommonCommand;
 use CrestApps\CodeGenerator\Traits\GeneratorReplacers;
 use Illuminate\Console\Command;
+use CrestApps\CodeGenerator\Support\Str;
 
 class ControllerRequestCommandBase extends Command
 {
@@ -174,7 +175,7 @@ protected function extractCustomValidationRules(array $rules)
      */
     protected function isCustomRule($rule)
     {
-        return starts_with(trim($rule), 'new ');
+        return Str::startsWith(trim($rule), 'new ');
     }
 
     /**
@@ -212,7 +213,7 @@ protected function getCustomRuleShortName($rule)
      */
     protected function canHaveUsingCommand($fullname)
     {
-        return !starts_with($fullname, '\\');
+        return !Str::startsWith($fullname, '\\');
     }
 
     /**
diff --git a/src/Commands/Bases/ResourceFileCreatorCommandBase.php b/src/Commands/Bases/ResourceFileCreatorCommandBase.php
@@ -34,7 +34,7 @@ protected function getCommandInput()
     {
         $modelName = trim($this->argument('model-name'));
         $filename = trim($this->option('resource-filename'));
-        $file = $filename ? str_finish($filename, '.json') : Helpers::makeJsonFileName($modelName);
+        $file = $filename ? Str::finish($filename, '.json') : Helpers::makeJsonFileName($modelName);
         $translationFor = array_unique(Arr::fromString($this->option('translation-for')));
         $fieldNames = array_unique(Arr::fromString($this->option('fields')));
         $relations = Arr::fromString($this->option('relations'));
diff --git a/src/Commands/Framework/CreateFormRequestCommand.php b/src/Commands/Framework/CreateFormRequestCommand.php
@@ -6,6 +6,7 @@
 use CrestApps\CodeGenerator\Models\Resource;
 use CrestApps\CodeGenerator\Support\Config;
 use CrestApps\CodeGenerator\Support\Helpers;
+use CrestApps\CodeGenerator\Support\Str;
 
 class CreateFormRequestCommand extends ControllerRequestCommandBase
 {
@@ -184,7 +185,7 @@ protected function isConvertEmptyStringsToNullRegistered()
      */
     protected function getDestenationFile($name, $path)
     {
-        return str_finish(app_path(Config::getRequestsPath($path)), '/') . $name . '.php';
+        return Str::finish(app_path(Config::getRequestsPath($path)), '/') . $name . '.php';
     }
 
     /**
@@ -196,7 +197,7 @@ protected function getDestenationFile($name, $path)
      */
     protected function getRequestsNamespace($path)
     {
-        $path = str_finish($path, '\\');
+        $path = Str::finish($path, '\\');
 
         $path = Helpers::getAppNamespace() . Config::getRequestsPath($path);
 
diff --git a/src/Commands/Framework/CreateMigrationCommand.php b/src/Commands/Framework/CreateMigrationCommand.php
@@ -12,6 +12,7 @@
 use CrestApps\CodeGenerator\Models\MigrationTrackerCapsule;
 use CrestApps\CodeGenerator\Models\Resource;
 use CrestApps\CodeGenerator\Support\Arr;
+use CrestApps\CodeGenerator\Support\Str;
 use CrestApps\CodeGenerator\Support\Config;
 use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\Support\MigrationHistoryTracker;
@@ -211,7 +212,7 @@ protected function getMigrationFullName($name)
             $folder = $this->tableName;
         }
 
-        return str_finish($this->getMigrationPath($folder) . DIRECTORY_SEPARATOR . $name, '.php');
+        return Str::finish($this->getMigrationPath($folder) . DIRECTORY_SEPARATOR . $name, '.php');
     }
 
     /**
diff --git a/src/Commands/Framework/CreateModelCommand.php b/src/Commands/Framework/CreateModelCommand.php
@@ -818,7 +818,7 @@ protected function replaceMutators(&$stub, $mutators)
     protected function replaceFieldName(&$stub, $name)
     {
         $stub = $this->strReplace('field_name', $name, $stub);
-        $stub = $this->strReplace('field_name_cap', ucwords(camel_case($name)), $stub);
+        $stub = $this->strReplace('field_name_cap', ucwords(Str::camel($name)), $stub);
 
         return $this;
     }
diff --git a/src/Commands/Resources/ResourceFileDeleteCommand.php b/src/Commands/Resources/ResourceFileDeleteCommand.php
@@ -59,7 +59,7 @@ protected function getCommandInput()
     {
         $modelName = trim($this->argument('model-name'));
         $filename = trim($this->option('resource-filename'));
-        $file = $filename ? str_finish($filename, '.json') : Helpers::makeJsonFileName($modelName);
+        $file = $filename ? Str::finish($filename, '.json') : Helpers::makeJsonFileName($modelName);
 
         return (object) compact('modelName', 'file');
     }
diff --git a/src/Commands/Resources/ResourceFileFromDatabaseCommand.php b/src/Commands/Resources/ResourceFileFromDatabaseCommand.php
@@ -152,7 +152,7 @@ protected function getNewFilename()
     {
         $filename = trim($this->option('resource-filename')) ?: Helpers::makeJsonFileName($this->getModelName());
 
-        return str_finish($filename, '.json');
+        return Str::finish($filename, '.json');
     }
 
     /**
diff --git a/src/Commands/Resources/ResourceFileReduceCommand.php b/src/Commands/Resources/ResourceFileReduceCommand.php
@@ -176,7 +176,7 @@ protected function getCommandInput()
     {
         $modelName = trim($this->argument('model-name'));
         $filename = trim($this->option('resource-filename'));
-        $file = $filename ? str_finish($filename, '.json') : Helpers::makeJsonFileName($modelName);
+        $file = $filename ? Str::finish($filename, '.json') : Helpers::makeJsonFileName($modelName);
         $fieldNames = array_unique(Arr::fromString($this->generatorOption('fields')));
         $relations = Arr::fromString(trim($this->option('relations')));
         $indexes = Arr::fromString(trim($this->option('indexes')));
diff --git a/src/Commands/Views/CreateCreateViewCommand.php b/src/Commands/Views/CreateCreateViewCommand.php
@@ -4,6 +4,7 @@
 
 use CrestApps\CodeGenerator\Commands\Bases\ViewsCommandBase;
 use CrestApps\CodeGenerator\Models\Resource;
+use CrestApps\CodeGenerator\Support\Str;
 
 class CreateCreateViewCommand extends ViewsCommandBase
 {
@@ -75,7 +76,7 @@ protected function handleCreateView()
      */
     protected function getFormName($modelName)
     {
-        return sprintf('create_%s_form', snake_case($modelName));
+        return sprintf('create_%s_form', Str::snake($modelName));
     }
 
     /**
@@ -87,6 +88,6 @@ protected function getFormName($modelName)
      */
     protected function getFormId($modelName)
     {
-        return sprintf('create_%s_form', snake_case($modelName));
+        return sprintf('create_%s_form', Str::snake($modelName));
     }
 }
diff --git a/src/Commands/Views/CreateEditViewCommand.php b/src/Commands/Views/CreateEditViewCommand.php
@@ -4,6 +4,7 @@
 
 use CrestApps\CodeGenerator\Commands\Bases\ViewsCommandBase;
 use CrestApps\CodeGenerator\Models\Resource;
+use CrestApps\CodeGenerator\Support\Str;
 
 class CreateEditViewCommand extends ViewsCommandBase
 {
@@ -75,7 +76,7 @@ protected function handleCreateView()
      */
     protected function getFormName($modelName)
     {
-        return sprintf('edit_%s_form', snake_case($modelName));
+        return sprintf('edit_%s_form', Str::snake($modelName));
     }
 
     /**
@@ -87,6 +88,6 @@ protected function getFormName($modelName)
      */
     protected function getFormId($modelName)
     {
-        return sprintf('edit_%s_form', snake_case($modelName));
+        return sprintf('edit_%s_form', Str::snake($modelName));
     }
 }
diff --git a/src/DatabaseParsers/MysqlParser.php b/src/DatabaseParsers/MysqlParser.php
@@ -202,10 +202,10 @@ protected function getRealtion($foreignTableName, $foreignColumn, $localColumn,
         $relationName = ($selfReferences ? 'child_' : '');
 
         if ($this->isOneToMany($foreignTableName, $foreignColumn)) {
-            return new ForeignRelationship('hasMany', $params, camel_case($relationName . Str::plural($foreignTableName)));
+            return new ForeignRelationship('hasMany', $params, Str::camel($relationName . Str::plural($foreignTableName)));
         }
 
-        return new ForeignRelationship('hasOne', $params, camel_case($relationName . Str::singular($foreignTableName)));
+        return new ForeignRelationship('hasOne', $params, Str::camel($relationName . Str::singular($foreignTableName)));
     }
 
     /**
diff --git a/src/DatabaseParsers/ParserBase.php b/src/DatabaseParsers/ParserBase.php
@@ -221,7 +221,7 @@ protected function makeModelName($tableName)
     {
         $name = Str::singular($tableName);
 
-        return ucfirst(camel_case($name));
+        return ucfirst(Str::camel($name));
     }
 
     /**
diff --git a/src/HtmlGenerators/LaravelCollectiveHtml.php b/src/HtmlGenerators/LaravelCollectiveHtml.php
@@ -229,7 +229,7 @@ protected function getMultipleRawOptionValue($name, $value, $defaultValue)
         $modelVariable = $this->getSingularVariable($this->modelName);
         $valueString = 'null';
         if (!is_null($value)) {
-            $valueString = starts_with($value, '$') ? sprintf("%s", $value) : sprintf("'%s'", $value);
+            $valueString = Str::startsWith($value, '$') ? sprintf("%s", $value) : sprintf("'%s'", $value);
         }
         $defaultValueString = '[]';
         if (!empty($defaultValue)) {
diff --git a/src/HtmlGenerators/StandardHtml.php b/src/HtmlGenerators/StandardHtml.php
@@ -278,7 +278,7 @@ protected function getMultipleRawOptionValue($name, $value, $defaultValue)
         $valueString = 'null';
 
         if (!is_null($value)) {
-            $valueString = starts_with($value, '$') ? sprintf("%s", $value) : sprintf("'%s'", $value);
+            $valueString = Str::startsWith($value, '$') ? sprintf("%s", $value) : sprintf("'%s'", $value);
         }
 
         $defaultValueString = '[]';
diff --git a/src/Models/Field.php b/src/Models/Field.php
@@ -1809,7 +1809,7 @@ public static function isValidHtmlType(array $properties)
     public static function isValidSelectRangeType(array $properties)
     {
         return Arr::isKeyExists($properties, 'html-type')
-        && starts_with($properties['html-type'], 'selectRange|');
+        && Str::startsWith($properties['html-type'], 'selectRange|');
     }
 
     /**
diff --git a/src/Models/ForeignConstraint.php b/src/Models/ForeignConstraint.php
@@ -141,7 +141,7 @@ public function getForeignRelation()
      */
     protected function getForeignModelName($prefix = '')
     {
-        return ucfirst(camel_case($prefix . Str::singular($this->references)));
+        return ucfirst(Str::camel($prefix . Str::singular($this->references)));
     }
 
     /**
diff --git a/src/Models/ForeignRelationship.php b/src/Models/ForeignRelationship.php
@@ -542,6 +542,6 @@ public static function makeRelationName($fieldName)
     {
         $modelName = self::extractModelName($fieldName);
 
-        return camel_case($modelName);
+        return Str::camel($modelName);
     }
 }
diff --git a/src/Models/Resource.php b/src/Models/Resource.php
@@ -6,6 +6,7 @@
 use CrestApps\CodeGenerator\Models\Index;
 use CrestApps\CodeGenerator\Models\Relation;
 use CrestApps\CodeGenerator\Support\Arr;
+use CrestApps\CodeGenerator\Support\Str;
 use CrestApps\CodeGenerator\Support\Config;
 use CrestApps\CodeGenerator\Support\Contracts\JsonWriter;
 use CrestApps\CodeGenerator\Support\FieldTransformer;
@@ -158,7 +159,7 @@ public function setProtection($name, $isProtected)
      */
     protected function getProtectionKey($name)
     {
-        $key = str_is('is-*-protected', $name) ? $name : sprintf('is-%s-protected', $name);
+        $key = Str::is('is-*-protected', $name) ? $name : sprintf('is-%s-protected', $name);
 
         return $key;
     }
diff --git a/src/Support/FieldTransformer.php b/src/Support/FieldTransformer.php
@@ -89,7 +89,7 @@ public static function fromString($str, $localeGroup = 'generic', array $languag
         foreach ($fieldNames as $fieldName) {
             $field = [];
 
-            if (str_contains($fieldName, ':')) {
+            if (Str::contains($fieldName, ':')) {
                 // Handle the following format
                 // name:a;html-type:select;options:first|second|third|fourth
                 if (!Str::is('*name*:*', $fieldName)) {
diff --git a/src/Support/Helpers.php b/src/Support/Helpers.php
@@ -20,7 +20,7 @@ class Helpers
     public static function makeControllerName($modelName)
     {
         $name = Str::properSnake($modelName, 'controller-name');
-        $case = ucfirst(camel_case($name));
+        $case = ucfirst(Str::camel($name));
 
         if (!empty($postfix = Config::getControllerNamePostFix())) {
             return Str::postfix($case, $postfix);
@@ -39,7 +39,7 @@ public static function makeControllerName($modelName)
     public static function makeApiResourceName($modelName)
     {
         $name = Str::properSnake($modelName, 'api-resource-name');
-        $case = ucfirst(camel_case($name));
+        $case = ucfirst(Str::camel($name));
 
         if (!empty($postfix = Config::getApiResourceNamePostFix())) {
             return Str::postfix($case, $postfix);
@@ -58,7 +58,7 @@ public static function makeApiResourceName($modelName)
     public static function makeApiResourceCollectionName($modelName)
     {
         $name = Str::properSnake($modelName, 'api-resource-collection-name');
-        $case = ucfirst(camel_case($name));
+        $case = ucfirst(Str::camel($name));
 
         if (!empty($postfix = Config::getApiResourceCollectionNamePostFix())) {
             return Str::postfix($case, $postfix);
@@ -97,9 +97,9 @@ public static function getAppName()
     public static function fixNamespace($path)
     {
         $path = self::convertSlashToBackslash($path);
-		
+
         $path = rtrim(Str::eliminateDuplicates($path, '\\'), '\\');
-		
+
         return $path;
     }
 
@@ -158,10 +158,10 @@ public static function convertNameToLabel($name)
     public static function makeFormRequestName($modelName)
     {
         $name = Str::properSnake($modelName, 'request-form-name');
-        $case = ucfirst(camel_case($name));
+        $case = ucfirst(Str::camel($name));
 
         if (!empty($postFix = Config::getFormRequestNamePostFix())) {
-            return str_finish($case, $postFix);
+            return Str::finish($case, $postFix);
         }
 
         return $case;
@@ -202,7 +202,7 @@ public static function makeJsonFileName($modelName)
     {
         $snake = Str::properSnake($modelName, 'resource-file-name');
 
-        return str_finish($snake, '.json');
+        return Str::finish($snake, '.json');
     }
 
     /**
diff --git a/src/Support/Str.php b/src/Support/Str.php
@@ -371,6 +371,6 @@ public static function extractClassFromString($string)
      */
     public static function isQualifiedNamespace($name)
     {
-        return !empty($name) && !starts_with($name, '\\');
+        return !empty($name) && !Str::startsWith($name, '\\');
     }
 }
diff --git a/src/Support/ValidationParser.php b/src/Support/ValidationParser.php
diff --git a/src/Traits/ApiResourceTrait.php b/src/Traits/ApiResourceTrait.php
diff --git a/src/Traits/CommonCommand.php b/src/Traits/CommonCommand.php
diff --git a/src/Traits/GeneratorReplacers.php b/src/Traits/GeneratorReplacers.php
diff --git a/src/Traits/Migration.php b/src/Traits/Migration.php
diff --git a/src/Traits/ScaffoldTrait.php b/src/Traits/ScaffoldTrait.php

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ protected function getCommandInput()`
`261`	`261`	`{`
`262`	`262`	`$modelName = trim($this->argument('model-name'));`
`263`	`263`	`$cName = trim($this->option('controller-name'));`
`264`		`- $controllerName = $cName ? str_finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);`
	`264`	`+ $controllerName = $cName ? Str::finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);`
`265`	`265`	`$prefix = ($this->option('routes-prefix') == 'default-form') ? Helpers::makeRouteGroup($modelName) : $this->option('routes-prefix');`
`266`	`266`	`$resourceFile = trim($this->option('resource-file')) ?: Helpers::makeJsonFileName($modelName);`
`267`	`267`	`$force = $this->option('force');`
Original file line number	Diff line number	Diff line change
`@@ -319,22 +319,22 @@ protected function getValidationRules(Field $field)`
`319`	`319`	`continue;`
`320`	`320`	`}`
`321`	`321`
`322`		`- if ($hasString && starts_with($rule, 'min:')) {`
	`322`	`+ if ($hasString && Str::startsWith($rule, 'min:')) {`
`323`	`323`	`$rules[] = 'Minimum Length: ' . Str::trimEnd($rule, 'min:');`
`324`	`324`	`continue;`
`325`	`325`	`}`
`326`	`326`
`327`		`- if ($hasString && starts_with($rule, 'max:')) {`
	`327`	`+ if ($hasString && Str::startsWith($rule, 'max:')) {`
`328`	`328`	`$rules[] = 'Maximum Length: ' . Str::trimEnd($rule, 'max:');`
`329`	`329`	`continue;`
`330`	`330`	`}`
`331`	`331`
`332`		`- if ($hasNumber && starts_with($rule, 'min:')) {`
	`332`	`+ if ($hasNumber && Str::startsWith($rule, 'min:')) {`
`333`	`333`	`$rules[] = 'Minimum Value: ' . Str::trimEnd($rule, 'min:');`
`334`	`334`	`continue;`
`335`	`335`	`}`
`336`	`336`
`337`		`- if ($hasNumber && starts_with($rule, 'max:')) {`
	`337`	`+ if ($hasNumber && Str::startsWith($rule, 'max:')) {`
`338`	`338`	`$rules[] = 'Maximum Value: ' . Str::trimEnd($rule, 'max:');`
`339`	`339`	`continue;`
`340`	`340`	`}`
`@@ -548,7 +548,7 @@ protected function getCommandInput()`
`548`	`548`	`{`
`549`	`549`	`$modelName = trim($this->argument('model-name'));`
`550`	`550`	`$cName = trim($this->option('controller-name'));`
`551`		`- $controllerName = $cName ? str_finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);`
	`551`	`+ $controllerName = $cName ? Str::finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);`
`552`	`552`	`$controllerDirectory = trim($this->option('controller-directory'));`
`553`	`553`	`$viewsDirectory = trim($this->option('views-directory'));`
`554`	`554`	`$layoutName = trim($this->option('layout-name'));`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ protected function getCommandInput()`
`183`	`183`	`{`
`184`	`184`	`$modelName = trim($this->argument('model-name'));`
`185`	`185`	`$cName = trim($this->option('controller-name'));`
`186`		`- $controllerName = $cName ? str_finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);`
	`186`	`+ $controllerName = $cName ? Str::finish($cName, Config::getControllerNamePostFix()) : Helpers::makeControllerName($modelName);`
`187`	`187`	`$prefix = ($this->option('routes-prefix') == 'default-form') ? Helpers::makeRouteGroup($modelName) : $this->option('routes-prefix');`
`188`	`188`	`$perPage = intval($this->option('models-per-page'));`
`189`	`189`	`$resourceFile = trim($this->option('resource-file')) ?: Helpers::makeJsonFileName($modelName);`
`@@ -486,7 +486,7 @@ protected function getRelationCollections(array $fields, $view)`
`486`	`486`	`protected function getRequestsNamespace($name, $path)`
`487`	`487`	`{`
`488`	`488`	`if (!empty($path)) {`
`489`		`- $path = str_finish($path, '\\');`
	`489`	`+ $path = Str::finish($path, '\\');`
`490`	`490`	`}`
`491`	`491`
`492`	`492`	`$path = Helpers::getAppNamespace() . Config::getRequestsPath($path);`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`use CrestApps\CodeGenerator\Traits\CommonCommand;`
`9`	`9`	`use CrestApps\CodeGenerator\Traits\GeneratorReplacers;`
`10`	`10`	`use Illuminate\Console\Command;`
	`11`	`+use CrestApps\CodeGenerator\Support\Str;`
`11`	`12`
`12`	`13`	`class ControllerRequestCommandBase extends Command`
`13`	`14`	`{`
`@@ -174,7 +175,7 @@ protected function extractCustomValidationRules(array $rules)`
`174`	`175`	`*/`
`175`	`176`	`protected function isCustomRule($rule)`
`176`	`177`	`{`
`177`		`- return starts_with(trim($rule), 'new ');`
	`178`	`+ return Str::startsWith(trim($rule), 'new ');`
`178`	`179`	`}`
`179`	`180`
`180`	`181`	`/**`
`@@ -212,7 +213,7 @@ protected function getCustomRuleShortName($rule)`
`212`	`213`	`*/`
`213`	`214`	`protected function canHaveUsingCommand($fullname)`
`214`	`215`	`{`
`215`		`- return !starts_with($fullname, '\\');`
	`216`	`+ return !Str::startsWith($fullname, '\\');`
`216`	`217`	`}`
`217`	`218`
`218`	`219`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected function getCommandInput()`
`34`	`34`	`{`
`35`	`35`	`$modelName = trim($this->argument('model-name'));`
`36`	`36`	`$filename = trim($this->option('resource-filename'));`
`37`		`- $file = $filename ? str_finish($filename, '.json') : Helpers::makeJsonFileName($modelName);`
	`37`	`+ $file = $filename ? Str::finish($filename, '.json') : Helpers::makeJsonFileName($modelName);`
`38`	`38`	`$translationFor = array_unique(Arr::fromString($this->option('translation-for')));`
`39`	`39`	`$fieldNames = array_unique(Arr::fromString($this->option('fields')));`
`40`	`40`	`$relations = Arr::fromString($this->option('relations'));`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use CrestApps\CodeGenerator\Models\Resource;`
`7`	`7`	`use CrestApps\CodeGenerator\Support\Config;`
`8`	`8`	`use CrestApps\CodeGenerator\Support\Helpers;`
	`9`	`+use CrestApps\CodeGenerator\Support\Str;`
`9`	`10`
`10`	`11`	`class CreateFormRequestCommand extends ControllerRequestCommandBase`
`11`	`12`	`{`
`@@ -184,7 +185,7 @@ protected function isConvertEmptyStringsToNullRegistered()`
`184`	`185`	`*/`
`185`	`186`	`protected function getDestenationFile($name, $path)`
`186`	`187`	`{`
`187`		`- return str_finish(app_path(Config::getRequestsPath($path)), '/') . $name . '.php';`
	`188`	`+ return Str::finish(app_path(Config::getRequestsPath($path)), '/') . $name . '.php';`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`/**`
`@@ -196,7 +197,7 @@ protected function getDestenationFile($name, $path)`
`196`	`197`	`*/`
`197`	`198`	`protected function getRequestsNamespace($path)`
`198`	`199`	`{`
`199`		`- $path = str_finish($path, '\\');`
	`200`	`+ $path = Str::finish($path, '\\');`
`200`	`201`
`201`	`202`	`$path = Helpers::getAppNamespace() . Config::getRequestsPath($path);`
`202`	`203`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`use CrestApps\CodeGenerator\Models\MigrationTrackerCapsule;`
`13`	`13`	`use CrestApps\CodeGenerator\Models\Resource;`
`14`	`14`	`use CrestApps\CodeGenerator\Support\Arr;`
	`15`	`+use CrestApps\CodeGenerator\Support\Str;`
`15`	`16`	`use CrestApps\CodeGenerator\Support\Config;`
`16`	`17`	`use CrestApps\CodeGenerator\Support\Helpers;`
`17`	`18`	`use CrestApps\CodeGenerator\Support\MigrationHistoryTracker;`
`@@ -211,7 +212,7 @@ protected function getMigrationFullName($name)`
`211`	`212`	`$folder = $this->tableName;`
`212`	`213`	`}`
`213`	`214`
`214`		`- return str_finish($this->getMigrationPath($folder) . DIRECTORY_SEPARATOR . $name, '.php');`
	`215`	`+ return Str::finish($this->getMigrationPath($folder) . DIRECTORY_SEPARATOR . $name, '.php');`
`215`	`216`	`}`
`216`	`217`
`217`	`218`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,7 @@ protected function replaceMutators(&$stub, $mutators)`
`818`	`818`	`protected function replaceFieldName(&$stub, $name)`
`819`	`819`	`{`
`820`	`820`	`$stub = $this->strReplace('field_name', $name, $stub);`
`821`		`- $stub = $this->strReplace('field_name_cap', ucwords(camel_case($name)), $stub);`
	`821`	`+ $stub = $this->strReplace('field_name_cap', ucwords(Str::camel($name)), $stub);`
`822`	`822`
`823`	`823`	`return $this;`
`824`	`824`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected function getCommandInput()`
`59`	`59`	`{`
`60`	`60`	`$modelName = trim($this->argument('model-name'));`
`61`	`61`	`$filename = trim($this->option('resource-filename'));`
`62`		`- $file = $filename ? str_finish($filename, '.json') : Helpers::makeJsonFileName($modelName);`
	`62`	`+ $file = $filename ? Str::finish($filename, '.json') : Helpers::makeJsonFileName($modelName);`
`63`	`63`
`64`	`64`	`return (object) compact('modelName', 'file');`
`65`	`65`	`}`