implement controller generator

Author: Mulkave

src/Commands/ControllerMakeCommand.php

@@ -15,6 +15,7 @@
 use Lucid\Console\Filesystem;
 use Illuminate\Console\GeneratorCommand;
 use Symfony\Component\Console\Input\InputOption;
+use Lucid\Console\Generators\ControllerGenerator;
 use Symfony\Component\Console\Input\InputArgument;
 
 /**
@@ -53,31 +54,22 @@ class ControllerMakeCommand extends GeneratorCommand
      */
     public function fire()
     {
-        $service = studly_case($this->argument('service'));
-        $controller = $this->parseName($this->argument('controller'));
+        $generator = app(ControllerGenerator::class);
 
-        $path = $this->findControllerPath($service, $controller);
+        $service = $this->argument('service');
+        $name = $this->argument('controller');
 
-        if ($this->files->exists($path)) {
-            $this->error('Controller already exists');
+        try {
+            $controller = $generator->generate($name, $service);
 
-            return false;
+            $this->info('Controller class created successfully.'.
+                "\n".
+                "\n".
+                'Find it at <comment>'.strstr($controller, 'src/').'</comment>'."\n"
+            );
+        } catch (Exception $e) {
+            $this->error($e->getMessage());
         }
-
-        $namespace = $this->findControllerNamespace($service);
-
-        $content = file_get_contents($this->getStub());
-        $content = str_replace(
-            ['{{controller}}', '{{namespace}}', '{{foundation_namespace}}'],
-            [$controller, $namespace, $this->findFoundationNamespace()],
-            $content
-        );
-
-        $this->createFile($path, $content);
-        $this->info('Controller class '.$controller.' created successfully.'.
-            "\n".
-            "\n".
-            'Find it at <comment>'.strstr($path, 'src/').'</comment>'."\n");
     }
 
     /**
@@ -110,7 +102,7 @@ protected function getOptions()
      *  remove the Controller.php suffix if found
      *  we're adding it ourselves.
      *
-     * @param  string $name
+     * @param string $name
      *
      * @return string
      */

src/Generators/ControllerGenerator.php

@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the laravel-console project.
+ *
+ * (c) Vinelab <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Lucid\Console\Generators;
+
+use Lucid\Console\Str;
+
+/**
+ * @author Abed Halawi <[email protected]>
+ */
+class ControllerGenerator extends Generator
+{
+    public function generate($name, $service, $plain = false)
+    {
+        $name = Str::controller($name);
+        $service = Str::service($service);
+
+        $path = $this->findControllerPath($service, $name);
+
+        if ($this->files->exists($path)) {
+            $this->error('Controller already exists!');
+
+            return false;
+        }
+
+        $namespace = $this->findControllerNamespace($service);
+
+        $content = file_get_contents($this->getStub($plain));
+        $content = str_replace(
+             ['{{controller}}', '{{namespace}}', '{{foundation_namespace}}'],
+             [$name, $namespace, $this->findFoundationNamespace()],
+             $content
+         );
+
+        $this->createFile($path, $content);
+
+        return $this->relativeFromReal($path);
+    }
+
+    /**
+     * Get the stub file for the generator.
+     *
+     * @return string
+     */
+    protected function getStub($plain)
+    {
+        if ($plain) {
+            return __DIR__.'/stubs/controller.plain.stub';
+        }
+
+        return __DIR__.'/stubs/controller.stub';
+    }
+}

src/Generators/stubs/controller.plain.stub

@@ -1,5 +1,4 @@
 <?php
-
 namespace {{namespace}};
 
 use Illuminate\Http\Request;

src/Generators/stubs/controller.stub

@@ -1,9 +1,8 @@
 <?php
-
 namespace {{namespace}};
 
 use Illuminate\Http\Request;
-use {{foundation_namespace}}\Http\Controllers\Controller;
+use {{foundation_namespace}}\Http\Controller;
 
 class {{controller}} extends Controller
 {

src/Str.php

@@ -20,10 +20,10 @@ class Str
      * Determine the real name of the given name,
      * excluding the given pattern.
      * 	i.e. the name: "CreateArticleFeature.php" with pattern '/Feature.php'
-     * 		will result in "Create Article"
+     * 		will result in "Create Article".
      *
-     * @param  string $name
-     * @param  string $pattern
+     * @param string $name
+     * @param string $pattern
      *
      * @return string
      */
@@ -41,7 +41,7 @@ public static function realName($name, $pattern = '//')
      * 	and many other forms will be transformed to "CreatePostFeature" which is
      * 	the standard feature class name.
      *
-     * @param  string $name
+     * @param string $name
      *
      * @return string
      */
@@ -57,7 +57,7 @@ public static function feature($name)
      * 	and many other forms will be transformed to "CreatePostJob" which is
      * 	the standard job class name.
      *
-     * @param  string $name
+     * @param string $name
      *
      * @return string
      */
@@ -71,7 +71,7 @@ public static function job($name)
      *
      * Domain names are just CamelCase
      *
-     * @param  string $name
+     * @param string $name
      *
      * @return string
      */
@@ -83,12 +83,24 @@ public static function domain($name)
     /**
      * Get the given name formatted as a service name.
      *
-     * @param  string $name
+     * @param string $name
      *
      * @return string
      */
     public static function service($name)
     {
         return studly_case($name);
     }
+
+    /**
+     * Get the given name formatted as a controller name.
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    public static function controller($name)
+    {
+        return studly_case(preg_replace('/Controller(\.php)?$/', '', $name).'Controller');
+    }
 }