Merge pull request #3 from ARCANEDEV/feature-1

Updating service providers + cleaning
ARCANEDEV · Apr 18, 2016 · b8c901e · b8c901e
2 parents bbe6d6b + a1242fc
commit b8c901e
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 15 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,5 @@
-/examples         export-ignore
 /tests            export-ignore
+/.editorconfig    export-ignore
 /.gitattributes   export-ignore
 /.gitignore       export-ignore
 /.scrutinizer.yml export-ignore

diff --git a/src/PackageServiceProvider.php b/src/PackageServiceProvider.php
@@ -21,7 +21,7 @@ abstract class PackageServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    protected $vendor       = 'vendor';
+    protected $vendor       = 'arcanedev';
 
     /**
      * Package name.
@@ -148,6 +148,17 @@ private function registerMultipleConfigs($separator = '.')
         }
     }
 
+    /**
+     * Register commands service provider.
+     *
+     * @param  \Illuminate\Support\ServiceProvider|string  $provider
+     */
+    protected function registerCommands($provider)
+    {
+        if ($this->app->runningInConsole())
+            $this->app->register($provider);
+    }
+
     /**
      * Publish the config file.
      */

diff --git a/src/Providers/CommandServiceProvider.php b/src/Providers/CommandServiceProvider.php
@@ -20,7 +20,7 @@ abstract class CommandServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    protected $vendor   = '';
+    protected $vendor   = 'arcanedev';
 
     /**
      * Package name.
@@ -56,13 +56,9 @@ protected function getCommandPrefix()
     {
         $this->checkPackageName();
 
-        $prefix = $this->package;
-
-        if ( ! empty($this->vendor)) {
-            $prefix = "{$this->vendor}.$prefix";
-        }
-
-        return $prefix;
+        return empty($this->vendor)
+            ? $this->package
+            : "{$this->vendor}.{$this->package}";
     }
 
     /**
@@ -74,9 +70,7 @@ protected function getCommandPrefix()
      */
     protected function getAbstractCommandName($name)
     {
-        $prefix = $this->getCommandPrefix();
-
-        return  "$prefix.commands.$name";
+        return  $this->getCommandPrefix() . ".commands.$name";
     }
 
     /* ------------------------------------------------------------------------------------------------

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -133,6 +133,34 @@ protected function alias($class, $alias)
         return $this;
     }
 
+    /* ------------------------------------------------------------------------------------------------
+     |  Services
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Get the config repository instance.
+     *
+     * @return \Illuminate\Config\Repository
+     */
+    protected function config()
+    {
+        return $this->app['config'];
+    }
+
+    /**
+     * Get the filesystem instance.
+     *
+     * @return \Illuminate\Filesystem\Filesystem
+     */
+    protected function filesystem()
+    {
+        return $this->app['files'];
+    }
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Deprecated Methods
+     | ------------------------------------------------------------------------------------------------
+     */
     /**
      * Add Aliases into the app.
      *

diff --git a/tests/Stubs/TestPackageServiceProvider.php b/tests/Stubs/TestPackageServiceProvider.php
@@ -14,8 +14,6 @@ class TestPackageServiceProvider extends PackageServiceProvider
      |  Properties
      | ------------------------------------------------------------------------------------------------
      */
-    protected $vendor  = 'arcanedev';
-
     protected $package = 'package';
 
     /* ------------------------------------------------------------------------------------------------