remove user provider name

3 files changed, 3 insertions, 20 deletions

diff --git a/Authentication/Token/Token.php b/Authentication/Token/Token.php
index 37b7ded..8927c80 100644
--- a/Authentication/Token/Token.php
+++ b/Authentication/Token/Token.php
@@ -26,7 +26,6 @@ abstract class Token implements TokenInterface
     protected $roles;
     protected $authenticated;
     protected $user;
-    protected $userProviderName;
     protected $credentials;
     protected $immutable;
 
@@ -167,14 +166,6 @@ abstract class Token implements TokenInterface
     }
 
     /**
-     * {@inheritDoc}
-     */
-    public function getUserProviderName()
-    {
-        return $this->userProviderName;
-    }
-
-    /**
      * {@inheritdoc}
      */
     public function isImmutable()
@@ -195,7 +186,7 @@ abstract class Token implements TokenInterface
      */
     public function serialize()
     {
-        return serialize(array($this->user, $this->userProviderName, $this->credentials, $this->authenticated, $this->roles, $this->immutable));
+        return serialize(array($this->user, $this->credentials, $this->authenticated, $this->roles, $this->immutable));
     }
 
     /**
@@ -203,6 +194,6 @@ abstract class Token implements TokenInterface
      */
     public function unserialize($serialized)
     {
-        list($this->user, $this->userProviderName, $this->credentials, $this->authenticated, $this->roles, $this->immutable) = unserialize($serialized);
+        list($this->user, $this->credentials, $this->authenticated, $this->roles, $this->immutable) = unserialize($serialized);
     }
 }
diff --git a/Authentication/Token/TokenInterface.php b/Authentication/Token/TokenInterface.php
index 4f37522..2b50693 100644
--- a/Authentication/Token/TokenInterface.php
+++ b/Authentication/Token/TokenInterface.php
@@ -66,13 +66,6 @@ interface TokenInterface extends \Serializable
     function setUser($user);
 
     /**
-     * Returns a unique id for the user provider that was used to retrieve the user
-     *
-     * @return string
-     */
-    function getUserProviderName();
-
-    /**
      * Checks if the user is authenticated or not.
      *
      * @return Boolean true if the token has been authenticated, false otherwise
diff --git a/Authentication/Token/UsernamePasswordToken.php b/Authentication/Token/UsernamePasswordToken.php
index ce11cb3..021a90e 100644
--- a/Authentication/Token/UsernamePasswordToken.php
+++ b/Authentication/Token/UsernamePasswordToken.php
@@ -21,13 +21,12 @@ class UsernamePasswordToken extends Token
     /**
      * Constructor.
      */
-    public function __construct($user, $credentials, $userProviderName = null, array $roles = array())
+    public function __construct($user, $credentials, array $roles = array())
     {
         parent::__construct($roles);
 
         $this->setUser($user);
         $this->credentials = $credentials;
-        $this->userProviderName = $userProviderName;
 
         parent::setAuthenticated((Boolean) count($roles));
     }