Permalink
Browse files

Merge remote branch 'mvrhov/variousFixes'

  • Loading branch information...
2 parents dc66c53 + 9deee60 commit 248ff1b9c463bd76f1ed0e46a289839bd6998c6d Fabien Potencier committed Mar 21, 2011
Showing with 2 additions and 4 deletions.
  1. +2 −2 Core/User/User.php
  2. +0 −2 Http/Authorization/AccessDeniedHandlerInterface.php
View
@@ -22,9 +22,9 @@
{
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)
@@ -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

0 comments on commit 248ff1b

Please sign in to comment.