Inject key instead of app instance

laravel · Feb 23, 2017 · e8711af · e8711af
1 parent 38f4a25
commit e8711af
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/Illuminate/Auth/Passwords/PasswordBroker.php b/src/Illuminate/Auth/Passwords/PasswordBroker.php
@@ -15,11 +15,11 @@
 class PasswordBroker implements PasswordBrokerContract
 {
     /**
-     * The application instance.
+     * The application key.
      *
-     * @var \Illuminate\Foundation\Application
+     * @var string
      */
-    protected $app;
+    protected $key;
 
     /**
      * The user provider implementation.
@@ -45,13 +45,14 @@ class PasswordBroker implements PasswordBrokerContract
     /**
      * Create a new password broker instance.
      *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
      * @param  \Illuminate\Contracts\Auth\UserProvider  $users
+     * @param  string  $key
+     * @param  int  $expiration
      * @return void
      */
-    public function __construct(Application $app, UserProvider $users, $expiration)
+    public function __construct(UserProvider $users, $key, $expiration)
     {
-        $this->app = $app;
+        $this->key = $key;
         $this->users = $users;
         $this->expiration = $expiration;
     }
@@ -255,13 +256,11 @@ public function validateTimestamp($expiration)
      */
     public function getKey()
     {
-        $key = $this->app['config']['app.key'];
-
-        if (Str::startsWith($key, 'base64:')) {
-            $key = base64_decode(substr($key, 7));
+        if (Str::startsWith($this->key, 'base64:')) {
+            return base64_decode(substr($this->key, 7));
         }
 
-        return $key;
+        return $this->key;
     }
 
     /**

diff --git a/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php b/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php
@@ -64,8 +64,8 @@ protected function resolve($name)
         }
 
         return new PasswordBroker(
-            $this->app,
             $this->app['auth']->createUserProvider($config['provider']),
+            $this->app['config']['app.key'],
             $config['expire']
         );
     }

diff --git a/tests/Auth/AuthPasswordBrokerTest.php b/tests/Auth/AuthPasswordBrokerTest.php
@@ -126,14 +126,14 @@ public function testRedirectReturnedByRemindWhenPasswordDoesntPassValidator()
 
     protected function getBroker($mocks)
     {
-        return new \Illuminate\Auth\Passwords\PasswordBroker($mocks['app'], $mocks['users'], $mocks['expiration']);
+        return new \Illuminate\Auth\Passwords\PasswordBroker($mocks['users'], $mocks['key'], $mocks['expiration']);
     }
 
     protected function getMocks()
     {
         $mocks = [
-            'app' => m::mock('Illuminate\Contracts\Foundation\Application'),
             'users' => m::mock('Illuminate\Contracts\Auth\UserProvider'),
+            'key' => 'secret',
             'expiration' => time(),
         ];