for 6.0

summerblue · Sep 19, 2019 · 7ccb614 · 7ccb614
1 parent 78ef029
commit 7ccb614
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "summerblue/generator",
-  "description": "Extend Laravel 5.5's generators scaffold.",
+  "description": "Extend Laravel's generators scaffold.",
   "keywords": [
     "laravel",
     "generators",
@@ -23,8 +23,8 @@
     "php": ">=7.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~5.7",
-    "laravel/laravel": "5.5.*"
+    "phpunit/phpunit": "^8.0",
+    "laravel/laravel": "6.*"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Commands/ScaffoldMakeCommand.php b/src/Commands/ScaffoldMakeCommand.php
@@ -324,13 +324,13 @@ public function getObjName($config = 'Name')
         $args_name = $this->argument('name');
 
         // Name[0] = Tweet
-        $names['Name'] = str_singular(ucfirst($args_name));
+        $names['Name'] = \Str::singular(ucfirst($args_name));
         // Name[1] = Tweets
-        $names['Names'] = str_plural(ucfirst($args_name));
+        $names['Names'] = \Str::plural(ucfirst($args_name));
         // Name[2] = tweets
-        $names['names'] = str_plural(strtolower(preg_replace('/(?<!^)([A-Z])/', '_$1', $args_name)));
+        $names['names'] = \Str::plural(strtolower(preg_replace('/(?<!^)([A-Z])/', '_$1', $args_name)));
         // Name[3] = tweet
-        $names['name'] = str_singular(strtolower(preg_replace('/(?<!^)([A-Z])/', '_$1', $args_name)));
+        $names['name'] = \Str::singular(strtolower(preg_replace('/(?<!^)([A-Z])/', '_$1', $args_name)));
 
 
         if (!isset($names[$config])) {

diff --git a/src/Makes/MakeMigration.php b/src/Makes/MakeMigration.php
@@ -45,7 +45,7 @@ public function __construct(ScaffoldMakeCommand $scaffoldCommand, Filesystem $fi
      * @return void
      */
     protected function start(){
-        $name = 'create_'.str_plural(strtolower( $this->scaffoldCommandObj->argument('name') )).'_table';
+        $name = 'create_'.\Str::plural(strtolower( $this->scaffoldCommandObj->argument('name') )).'_table';
         $path = $this->getPath($name);
 
         if ( ! $this->classExists($name))
@@ -99,7 +99,7 @@ protected function replaceSchema(&$stub)
 
         $schema = (new SyntaxBuilder)->create($schema, $this->scaffoldCommandObj->getMeta());
         $stub = str_replace(['{{schema_up}}', '{{schema_down}}'], $schema, $stub);
-        
+
         return $this;
     }
 
@@ -114,4 +114,4 @@ public function classExists($name)
 
         return false;
     }
-}
+}
diff --git a/src/Migrations/SchemaParser.php b/src/Migrations/SchemaParser.php
@@ -110,7 +110,7 @@ private function parseOptions($options)
         if (empty($options)) return [];
 
         foreach ($options as $option) {
-            if (str_contains($option, '(')) {
+            if (\Str::contains($option, '(')) {
                 preg_match('/([a-z]+)\(([^\)]+)\)/i', $option, $matches);
 
                 $results[$matches[1]] = $matches[2];
@@ -147,7 +147,7 @@ private function addForeignConstraint($segments)
      */
     private function getTableNameFromForeignKey($key)
     {
-        return str_plural(str_replace('_id', '', $key));
+        return \Str::plural(str_replace('_id', '', $key));
     }
 
     /**