Second try on manager.

laravel · Nov 4, 2017 · c272b15 · c272b15
1 parent b7ddd6c
commit c272b15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/Illuminate/Foundation/helpers.php b/src/Illuminate/Foundation/helpers.php
@@ -193,7 +193,8 @@ function base_path($path = '')
      */
     function bcrypt($value, $options = [])
     {
-        return app('hash.bcrypt')
+        return app('hash')
+            ->driver('bcrypt')
             ->make($value, $options);
     }
 }

diff --git a/src/Illuminate/Hashing/HashServiceProvider.php b/src/Illuminate/Hashing/HashServiceProvider.php
@@ -20,16 +20,8 @@ class HashServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton('hash.manager', function ($app) {
-            return (new HashManager($app));
-        });
-
         $this->app->singleton('hash', function ($app) {
-            return $app['hash.manager']->driver();
-        });
-
-        $this->app->singleton('hash.bcrypt', function($app) {
-            return $app['hash.manager']->driver('bcrypt');
+            return new HashManager($app);
         });
     }
 
@@ -40,6 +32,6 @@ public function register()
      */
     public function provides()
     {
-        return ['hash', 'hash.manager', 'hash.bcrypt'];
+        return ['hash'];
     }
 }