move filesystem-specific method to their own trait Filesystem

Author: Mulkave

src/Commands/ServiceMakeCommand.php

@@ -12,7 +12,7 @@
 namespace Lucid\Console\Commands;
 
 use Lucid\Console\Finder;
-use Illuminate\Filesystem\Filesystem;
+use Lucid\Console\Filesystem;
 use Illuminate\Console\GeneratorCommand;
 use Illuminate\Config\Repository as Config;
 use Symfony\Component\Console\Input\InputOption;
@@ -25,6 +25,7 @@
 class ServiceMakeCommand extends GeneratorCommand
 {
     use Finder;
+    use Filesystem;
 
     /**
      * The base namespace for this command.
@@ -54,13 +55,6 @@ class ServiceMakeCommand extends GeneratorCommand
      */
     protected $description = 'Create a new Service';
 
-    /**
-     * The type of class being generated.
-     *
-     * @var string
-     */
-    protected $type = 'Service';
-
     /**
      * The directories to be created under the service directory.
      *
@@ -76,6 +70,7 @@ class ServiceMakeCommand extends GeneratorCommand
 		'Http/Middleware/',
 		'Http/Requests/',
 		'Providers/',
+        'Features/',
 		'resources/',
 		'resources/lang/',
 		'resources/views/',
@@ -105,7 +100,7 @@ public function fire()
         $path = $this->getPath($name);
 
         if ($this->files->exists($path)) {
-            $this->error($this->type.' already exists!');
+            $this->error('Service already exists!');
 
             return false;
         }
@@ -149,31 +144,6 @@ public function getPath($name)
         return $this->findServicePath($name);
     }
 
-    /**
-     * Create an empty directory at the given path.
-     *
-     * @param  string $path
-     *
-     * @return bool
-     */
-    public function createDirectory($path)
-    {
-        return $this->files->makeDirectory($path, 0755, true, true);
-    }
-
-    /**
-     * Create a file at the given path with the given contents.
-     *
-     * @param  string $path
-     * @param  string $contents
-     *
-     * @return bool
-     */
-    public function createFile($path, $contents = '')
-    {
-        return $this->files->put($path, $contents);
-    }
-
     /**
      * Create the default directories at the given service path.
      *
@@ -236,7 +206,7 @@ public function createRouteServiceProvider($name, $path, $slug, $namespace)
     {
         $serviceNamespace = $this->findServiceNamespace($name);
         $controllers = $serviceNamespace.'\Http\Controllers';
-        $foundation = $this->findRootNamespace().'\Foundation';
+        $foundation = $this->findFoundationNamespace();
 
         $content = file_get_contents(__DIR__.'/stubs/routeserviceprovider.stub');
         $content = str_replace(

src/Filesystem.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the lucid-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;
+
+/**
+ * @author Abed Halawi <[email protected]>
+ */
+trait Filesystem
+{
+    /**
+     * Create an empty directory at the given path.
+     *
+     * @param  string $path
+     *
+     * @return bool
+     */
+    public function createDirectory($path)
+    {
+        return $this->files->makeDirectory($path, 0755, true, true);
+    }
+
+    /**
+     * Create a file at the given path with the given contents.
+     *
+     * @param  string $path
+     * @param  string $contents
+     *
+     * @return bool
+     */
+    public function createFile($path, $contents = '')
+    {
+        return $this->files->put($path, $contents);
+    }
+}