Merge pull request #45 from lextira/laravel-7.x

Laravel 7.x update

composer.json

@@ -17,10 +17,17 @@
     "bin": ["lucid"],
     "minimum-stability": "stable",
     "require": {
-        "symfony/console": "^4.1",
-        "symfony/process": "^4.1",
-        "symfony/finder": "^4.1",
-        "symfony/filesystem": "^4.1",
-        "phploc/phploc": "~4.0"
+        "symfony/console": "^5.0",
+        "symfony/process": "^5.0",
+        "symfony/finder": "^5.0",
+        "symfony/filesystem": "^5.0",
+        "phploc/phploc": "^6.0"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Lucid\\Console\\LucidServiceProvider"
+            ]
+        }
     }
 }

src/Commands/ControllerMakeCommand.php

@@ -14,6 +14,7 @@
 use Lucid\Console\Finder;
 use Lucid\Console\Command;
 use Lucid\Console\Filesystem;
+use Lucid\Console\Str;
 use Symfony\Component\Console\Input\InputOption;
 use Lucid\Console\Generators\ControllerGenerator;
 use Symfony\Component\Console\Input\InputArgument;
@@ -110,7 +111,7 @@ protected function getOptions()
      */
     protected function parseName($name)
     {
-        return studly_case(preg_replace('/Controller(\.php)?$/', '', $name).'Controller');
+        return Str::studly(preg_replace('/Controller(\.php)?$/', '', $name).'Controller');
     }
 
     /**

src/Commands/FeatureMakeCommand.php

@@ -57,7 +57,7 @@ class FeatureMakeCommand extends SymfonyCommand
     public function handle()
     {
         try {
-            $service = studly_case($this->argument('service'));
+            $service = Str::studly($this->argument('service'));
             $title = $this->parseName($this->argument('feature'));
 
             $generator = new FeatureGenerator();

src/Commands/JobDeleteCommand.php

@@ -56,7 +56,7 @@ class JobDeleteCommand extends SymfonyCommand
     public function handle()
     {
         try {
-            $domain = studly_case($this->argument('domain'));
+            $domain = Str::studly($this->argument('domain'));
             $title = $this->parseName($this->argument('job'));
 
             if (!$this->exists($job = $this->findJobPath($domain, $title))) {

src/Commands/JobMakeCommand.php

@@ -59,7 +59,7 @@ public function handle()
     {
         $generator = new JobGenerator();
 
-        $domain = studly_case($this->argument('domain'));
+        $domain = Str::studly($this->argument('domain'));
         $title = $this->parseName($this->argument('job'));
         $isQueueable = $this->option('queue');
         try {

src/Commands/OperationMakeCommand.php

@@ -59,7 +59,7 @@ public function handle()
     {
         $generator = new OperationGenerator();
 
-        $service = studly_case($this->argument('service'));
+        $service = Str::studly($this->argument('service'));
         $title = $this->parseName($this->argument('operation'));
         $isQueueable = $this->option('queue');
         try {

src/Components/Service.php

@@ -11,6 +11,8 @@
 
 namespace Lucid\Console\Components;
 
+use Lucid\Console\Str;
+
 /**
  * @author Abed Halawi <[email protected]>
  */
@@ -20,7 +22,7 @@ public function __construct($name, $realPath, $relativePath)
     {
         $this->setAttributes([
             'name' => $name,
-            'slug' => snake_case($name),
+            'slug' => Str::snake($name),
             'realPath' => $realPath,
             'relativePath' => $relativePath,
         ]);

src/Generators/JobGenerator.php

@@ -76,7 +76,7 @@ private function generateTestFile($job, $domain)
 
         $content = str_replace(
             ['{{namespace}}', '{{testclass}}', '{{job}}', '{{job_namespace}}'],
-            [$namespace, $testClass, snake_case($job), $jobNamespace],
+            [$namespace, $testClass, Str::snake($job), $jobNamespace],
             $content
         );
 

src/Generators/ServiceGenerator.php

@@ -49,7 +49,7 @@ class ServiceGenerator extends Generator
     public function generate($name)
     {
         $name = Str::service($name);
-        $slug = snake_case($name);
+        $slug = Str::snake($name);
         $path = $this->findServicePath($name);
 
         if ($this->exists($path)) {

src/Http/Controller.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Lucid\Console\Http;
+
+use Lucid\Console\Finder;
+
+class Controller
+{
+    use Finder;
+}

src/Http/routes.php

@@ -2,7 +2,8 @@
 
 namespace Lucid\Console;
 
-use Route;
+use Illuminate\Support\Facades\Route;
+use Lucid\Console\Http\Controller;
 
 Route::group(['prefix' => 'lucid'], function () {
 
@@ -88,8 +89,3 @@
     });
 
 });
-
-class Controller
-{
-    use Finder;
-}

src/Str.php

@@ -11,11 +11,36 @@
 
 namespace Lucid\Console;
 
+use Illuminate\Support\Str as LaravelStr;
+
 /**
  * @author Abed Halawi <[email protected]>
  */
 class Str
 {
+    /**
+     * Convert a value to studly caps case.
+     *
+     * @param  string  $value
+     * @return string
+     */
+    public static function studly($value)
+    {
+        return LaravelStr::studly($value);
+    }
+
+    /**
+     * Convert a string to snake case.
+     *
+     * @param  string  $value
+     * @param  string  $delimiter
+     * @return string
+     */
+    public static function snake($value, $delimiter = '_')
+    {
+        return LaravelStr::snake($value, $delimiter);
+    }
+
     /**
      * Determine the real name of the given name,
      * excluding the given pattern.
@@ -47,7 +72,7 @@ public static function realName($name, $pattern = '//')
      */
     public static function feature($name)
     {
-        return studly_case(preg_replace('/Feature(\.php)?$/', '', $name).'Feature');
+        return self::studly(preg_replace('/Feature(\.php)?$/', '', $name).'Feature');
     }
 
     /**
@@ -63,7 +88,7 @@ public static function feature($name)
      */
     public static function job($name)
     {
-        return studly_case(preg_replace('/Job(\.php)?$/', '', $name).'Job');
+        return self::studly(preg_replace('/Job(\.php)?$/', '', $name).'Job');
     }
 
     /**
@@ -79,7 +104,7 @@ public static function job($name)
      */
     public static function operation($name)
     {
-        return studly_case(preg_replace('/Operation(\.php)?$/', '', $name).'Operation');
+        return self::studly(preg_replace('/Operation(\.php)?$/', '', $name).'Operation');
     }
 
     /**
@@ -93,7 +118,7 @@ public static function operation($name)
      */
     public static function domain($name)
     {
-        return studly_case($name);
+        return self::studly($name);
     }
 
     /**
@@ -105,7 +130,7 @@ public static function domain($name)
      */
     public static function service($name)
     {
-        return studly_case($name);
+        return self::studly($name);
     }
 
     /**
@@ -117,7 +142,7 @@ public static function service($name)
      */
     public static function controller($name)
     {
-        return studly_case(preg_replace('/Controller(\.php)?$/', '', $name).'Controller');
+        return self::studly(preg_replace('/Controller(\.php)?$/', '', $name).'Controller');
     }
 
     /**
@@ -131,7 +156,7 @@ public static function controller($name)
      */
     public static function model($name)
     {
-        return studly_case($name);
+        return self::studly($name);
     }
 
     /**
@@ -142,7 +167,7 @@ public static function model($name)
      */
     public static function policy($name)
     {
-        return studly_case(preg_replace('/Policy(\.php)?$/', '', $name) . 'Policy');
+        return self::studly(preg_replace('/Policy(\.php)?$/', '', $name) . 'Policy');
     }
 
     /**
@@ -153,6 +178,6 @@ public static function policy($name)
      */
     public static function request($name)
     {
-        return studly_case(preg_replace('/Request(\.php)?$/', '', $name) . 'Request');
+        return self::studly(preg_replace('/Request(\.php)?$/', '', $name) . 'Request');
     }
 }