adding service mapper; changing how providers will be called.

src/Clarity/Lang/LangServiceProvider.php

@@ -17,28 +17,20 @@
  */
 class LangServiceProvider extends ServiceProvider
 {
-    /**
-     * @var string
-     */
-    protected $alias = 'lang';
-
-    /**
-     * @var bool
-     */
-    protected $shared = false;
-
     /**
      * {@inheritdoc}
      */
     public function register()
     {
-        $language = config()->app->lang;
+        $this->app->singleton('lang', function () {
+            $language = config()->app->lang;
 
-        $translation = new Lang();
-        $translation
-            ->setLanguage($language)
-            ->setLangDir(config()->path->lang);
+            $translation = new Lang();
+            $translation
+                ->setLanguage($language)
+                ->setLangDir(config()->path->lang);
 
-        return $translation;
+            return $translation;
+        });
     }
 }

src/Clarity/Mail/MailServiceProvider.php

@@ -18,37 +18,31 @@
  */
 class MailServiceProvider extends ServiceProvider
 {
-    /**
-     * @var string
-     */
-    protected $alias = 'mail';
-
-    /**
-     * @var bool
-     */
-    protected $shared = false;
-
     /**
      * {@inheritdoc}
      */
     public function register()
     {
-        $selected_adapter = config()->app->mail_adapter;
+        $this->app->singleton('mail.selected_adapter', function () {
+            $selected_adapter = config()->app->mail_adapter;
 
-        $adapter = config()->mail->{$selected_adapter};
+            return config()->mail->{$selected_adapter};
+        });
 
-        if (! $adapter) {
-            throw new Exception('Adapter not found.');
-        }
+        $this->app->singleton('mail', function ($app) {
+            $adapter = $app->make('mail.selected_adapter')->toArray();
 
-        if (! $adapter['active']) {
-            return $this;
-        }
+            if (! $adapter) {
+                throw new Exception('Adapter not found.');
+            }
 
-        $adapter = $adapter->toArray();
+            if (! $adapter['active']) {
+                return $this;
+            }
 
-        $class = $adapter['class'];
+            $class = $adapter['class'];
 
-        return new Mail(new $class, $adapter['options']);
+            return new Mail(new $class, $adapter['options']);
+        });
     }
 }

src/Clarity/Providers/Aliaser.php

@@ -15,41 +15,17 @@
  */
 class Aliaser extends ServiceProvider
 {
-    /**
-     * {@inheridoc}.
-     */
-    protected $alias = 'aliaser';
-
-    /**
-     * {@inheridoc}.
-     */
-    protected $shared = true;
-
     /**
      * {@inheridoc}.
      */
     public function register()
     {
-        foreach (config()->app->aliases as $alias => $class) {
-            if (! class_exists($alias)) {
-                $this->append($alias, $class);
+        $this->app->singleton('aliaser', function () {
+            foreach (config('app.aliases') as $alias => $class) {
+                if (! class_exists($alias)) {
+                    class_alias($class, $alias);
+                }
             }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Attach the alias and the full class.
-     *
-     * @param  string $alias
-     * @param  string $class
-     * @return mixed
-     */
-    public function append($alias, $class)
-    {
-        class_alias($class, $alias);
-
-        return $this;
+        });
     }
 }

src/Clarity/Providers/Annotations.php

@@ -17,21 +17,11 @@
  */
 class Annotations extends ServiceProvider
 {
-    /**
-     * {@inheridoc}.
-     */
-    protected $alias = 'annotations';
-
-    /**
-     * {@inheridoc}.
-     */
-    protected $shared = true;
-
     /**
      * {@inheridoc}.
      */
     public function register()
     {
-        return new Memory;
+        $this->app->instance('annotations', new Memory, $singleton = true);
     }
 }

src/Clarity/Providers/Application.php

@@ -19,25 +19,17 @@
  */
 class Application extends ServiceProvider
 {
-    /**
-     * {@inheridoc}.
-     */
-    protected $alias = 'application';
-
-    /**
-     * {@inheridoc}.
-     */
-    protected $shared = true;
-
     /**
      * {@inheridoc}.
      */
     public function register()
     {
-        $instance = new BaseApplication($this->getDI());
+        $this->app->singleton('application', function () {
+            $instance = new BaseApplication($this->getDI());
 
-        Facade::setFacadeApplication($instance);
+            Facade::setFacadeApplication($instance);
 
-        return $instance;
+            return $instance;
+        });
     }
 }

src/Clarity/Providers/Auth.php

@@ -17,21 +17,11 @@
  */
 class Auth extends ServiceProvider
 {
-    /**
-     * {@inheridoc}.
-     */
-    protected $alias = 'auth';
-
-    /**
-     * {@inheridoc}.
-     */
-    protected $shared = true;
-
     /**
      * {@inheridoc}.
      */
     public function register()
     {
-        return new BaseAuth;
+        $this->app->instance('auth', new BaseAuth, $singleton = true);
     }
 }

src/Clarity/Providers/BehatMink.php

@@ -18,23 +18,15 @@
  */
 class BehatMink extends ServiceProvider
 {
-    /**
-     * {@inheridoc}.
-     */
-    protected $alias = 'behat_mink';
-
-    /**
-     * {@inheridoc}.
-     */
-    protected $shared = true;
-
     /**
      * {@inheridoc}.
      */
     public function register()
     {
-        $adapters = config()->test_suite->behat->adapters->toArray();
+        $this->app->singleton('behat_mink', function () {
+            $adapters = config()->test_suite->behat->adapters->toArray();
 
-        return new Mink($adapters);
+            return new Mink($adapters);
+        });
     }
 }

src/Clarity/Providers/Cache.php

@@ -15,16 +15,6 @@
  */
 class Cache extends ServiceProvider
 {
-    /**
-     * {@inheridoc}.
-     */
-    protected $alias = 'cache';
-
-    /**
-     * {@inheridoc}.
-     */
-    protected $shared = true;
-
     /**
      * Get the selected cache adapter.
      *
@@ -40,15 +30,17 @@ private function getSelectedAdapter()
      */
     public function register()
     {
-        $adapter = config()->cache->adapters->{$this->getSelectedAdapter()};
+        $this->app->singleton('cache', function () {
+            $adapter = config()->cache->adapters->{$this->getSelectedAdapter()};
 
-        $backend = $adapter->backend;
-        $frontend = $adapter->frontend;
+            $backend = $adapter->backend;
+            $frontend = $adapter->frontend;
 
-        $front_cache = new $frontend([
-            'lifetime' => $adapter->lifetime,
-        ]);
+            $front_cache = new $frontend([
+                'lifetime' => $adapter->lifetime,
+            ]);
 
-        return new $backend($front_cache, $adapter->options->toArray());
+            return new $backend($front_cache, $adapter->options->toArray());
+        });
     }
 }

src/Clarity/Providers/CollectionManager.php

@@ -18,21 +18,15 @@
  */
 class CollectionManager extends ServiceProvider
 {
-    /**
-     * {@inheridoc}.
-     */
-    protected $alias = 'collectionManager';
-
-    /**
-     * {@inheridoc}.
-     */
-    protected $shared = true;
-
     /**
      * {@inheridoc}.
      */
     public function register()
     {
-        return new BaseCollectionManager;
+        $this->app->instance(
+            'collectionManager',
+            new BaseCollectionManager,
+            $singleton = true
+        );
     }
 }

src/Clarity/Providers/Console.php

@@ -28,24 +28,21 @@ class Console extends ServiceProvider
      */
     const DESCRIPTION = 'Brood (c) Daison Cariño';
 
-    /**
-     * {@inheridoc}.
-     */
-    protected $alias = 'console';
-
     /**
      * {@inheridoc}.
      */
     public function register()
     {
-        $app = new ConsoleApplication(self::DESCRIPTION, self::VERSION);
+        $this->app->bind('console', function () {
+            $app = new ConsoleApplication(static::DESCRIPTION, static::VERSION);
 
-        if (is_cli()) {
-            foreach (config()->consoles as $console) {
-                $app->add(new $console);
+            if (is_cli()) {
+                foreach (config()->consoles as $console) {
+                    $app->add(new $console);
+                }
             }
-        }
 
-        return $app;
+            return $app;
+        });
     }
 }

src/Clarity/Providers/Cookies.php

@@ -17,21 +17,11 @@
  */
 class Cookies extends ServiceProvider
 {
-    /**
-     * {@inheridoc}.
-     */
-    protected $alias = 'cookies';
-
-    /**
-     * {@inheridoc}.
-     */
-    protected $shared = true;
-
     /**
      * {@inheridoc}.
      */
     public function register()
     {
-        return new BaseCookies;
+        $this->app->instance('cookies', new BaseCookies, $singleton = true);
     }
 }

src/Clarity/Providers/Crypt.php

@@ -34,19 +34,21 @@ class Crypt extends ServiceProvider
      */
     public function register()
     {
-        $crypt = new BaseCrypt();
+        $this->app->singleton('crypt', function () {
+            $crypt = new BaseCrypt();
 
-        if (Str::startsWith($key = config('app.encryption.key'), 'base64:')) {
-            $key = base64_decode(substr($key, 7));
-        }
+            if (Str::startsWith($key = config('app.encryption.key'), 'base64:')) {
+                $key = base64_decode(substr($key, 7));
+            }
 
-        $crypt->setKey($key);
-        $crypt->setCipher(config('app.encryption.cipher'));
+            $crypt->setKey($key);
+            $crypt->setCipher(config('app.encryption.cipher'));
 
-        if ((int) Version::getId() <= 2001341) {
-            $crypt->setMode(config('app.encryption.mode'));
-        }
+            if ((int) Version::getId() <= 2001341) {
+                $crypt->setMode(config('app.encryption.mode'));
+            }
 
-        return $crypt;
+            return $crypt;
+        });
     }
 }