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

Laravel 7.x update

Author: Mulkave

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;
+}