Merge pull request #31 from stephanvierkant/deprecated-AdvancedUserInterface

Replaced AdvancedUserInterface by UserInterface

Author: darookee

Security/TwoFactor/Provider/U2F/U2FAuthenticator.php

@@ -2,7 +2,7 @@
 
 namespace R\U2FTwoFactorBundle\Security\TwoFactor\Provider\U2F;
 
-use Symfony\Component\Security\Core\User\AdvancedUserInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use u2flib_server\U2F;
 
@@ -33,24 +33,24 @@ public function __construct(RequestStack $requestStack)
 
     /**
      * generateRequest
-     * @param AdvancedUserInterface $user
+     * @param UserInterface $user
      * @return string
      **/
-    public function generateRequest(AdvancedUserInterface $user)
+    public function generateRequest(UserInterface $user)
     {
         return $this->u2f->getAuthenticateData($user->getU2FKeys()->toArray());
     }
 
     /**
      * checkRequest
      *
-     * @param AdvancedUserInterface $user
+     * @param UserInterface $user
      * @param array $requests
      * @param mixed $authData
      *
      * @return bool
      */
-    public function checkRequest(AdvancedUserInterface $user, array $requests, $authData)
+    public function checkRequest(UserInterface $user, array $requests, $authData)
     {
         $reg = $this->u2f->doAuthenticate($requests, $user->getU2FKeys()->toArray(), json_decode($authData));
 
@@ -63,10 +63,10 @@ public function checkRequest(AdvancedUserInterface $user, array $requests, $auth
 
     /**
      * generateRegistrationRequest
-     * @param AdvancedUserInterface $user
+     * @param UserInterface $user
      * @return string
      **/
-    public function generateRegistrationRequest(AdvancedUserInterface $user)
+    public function generateRegistrationRequest(UserInterface $user)
     {
         return $this->u2f->getRegisterData($user->getU2FKeys()->toArray());
     }

Security/TwoFactor/Provider/U2F/U2FAuthenticatorInterface.php

@@ -2,7 +2,7 @@
 
 namespace R\U2FTwoFactorBundle\Security\TwoFactor\Provider\U2F;
 
-use Symfony\Component\Security\Core\User\AdvancedUserInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * Class U2FAuthenticatorInterface
@@ -12,17 +12,17 @@ interface U2FAuthenticatorInterface
 {
     /**
      * generateRequest
-     * @param AdvancedUserInterface $user
+     * @param UserInterface $user
      * @return string
      **/
-    public function generateRequest(AdvancedUserInterface $user);
+    public function generateRequest(UserInterface $user);
 
     /**
      * checkRequest
-     * @param AdvancedUserInterface $user
+     * @param UserInterface $user
      * @param array                 $requests
      * @param mixed                 $authData
      * @return boolean
      **/
-    public function checkRequest(AdvancedUserInterface $user, array $requests, $authData);
+    public function checkRequest(UserInterface $user, array $requests, $authData);
 }