moved the secure random dep for remember me as a constructor argument

2 files changed, 14 insertions, 5 deletions

diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
index 456d8be..65266b5 100644
--- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
+++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -33,8 +33,20 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices
     private $tokenProvider;
     private $secureRandom;
 
-    public function setSecureRandom(SecureRandom $secureRandom)
+    /**
+     * Constructor
+     *
+     * @param array           $userProviders
+     * @param string          $key
+     * @param string          $providerKey
+     * @param SecureRandom    $secureRandom
+     * @param array           $options
+     * @param LoggerInterface $logger
+     */
+    public function __construct(array $userProviders, $key, $providerKey, array $options = array(), LoggerInterface $logger = null, SecureRandom $secureRandom)
     {
+        parent::__construct($userProviders, $key, $providerKey, $options, $logger);
+
         $this->secureRandom = $secureRandom;
     }
 
diff --git a/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
index 24f1570..3cd1528 100644
--- a/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
+++ b/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -319,10 +319,7 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
             $userProvider = $this->getProvider();
         }
 
-        $r = new PersistentTokenBasedRememberMeServices(array($userProvider), 'fookey', 'fookey', $options, $logger);
-        $r->setSecureRandom(new SecureRandom());
-
-        return $r;
+        return new PersistentTokenBasedRememberMeServices(array($userProvider), 'fookey', 'fookey', $options, $logger, new SecureRandom());
     }
 
     protected function getProvider()