Merge remote branch 'mvrhov/variousFixes'

2 files changed, 2 insertions, 4 deletions

diff --git a/Core/User/User.php b/Core/User/User.php
index 7dcdee3..d586511 100644
--- a/Core/User/User.php
+++ b/Core/User/User.php
@@ -22,9 +22,9 @@ final class User implements AdvancedUserInterface
 {
     private $username;
     private $password;
-    private $userNonExpired;
+    private $accountNonExpired;
     private $credentialsNonExpired;
-    private $userNonLocked;
+    private $accountNonLocked;
     private $roles;
 
     public function __construct($username, $password, array $roles = array(), $enabled = true, $userNonExpired = true, $credentialsNonExpired = true, $userNonLocked = true)
diff --git a/Http/Authorization/AccessDeniedHandlerInterface.php b/Http/Authorization/AccessDeniedHandlerInterface.php
index 40576a6..42ac266 100644
--- a/Http/Authorization/AccessDeniedHandlerInterface.php
+++ b/Http/Authorization/AccessDeniedHandlerInterface.php
@@ -3,9 +3,7 @@
 namespace Symfony\Component\Security\Http\Authorization;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 
 /**
  * This is used by the ExceptionListener to translate an AccessDeniedException