summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-09-22 20:04:39 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2013-09-22 20:04:39 +0200
commit97faa986a60edadef4fc35fed239693ba13c9c9f (patch)
treee2acdbef67e7f55f90d9b8a6aecffc8906aaa039
parentfad88962af2ecb3e54e13c1f9e8045fd589e693f (diff)
parented68104bc3cffe77b574d3f8d0f7efe4983e50fb (diff)
downloadsymfony-security-97faa986a60edadef4fc35fed239693ba13c9c9f.zip
symfony-security-97faa986a60edadef4fc35fed239693ba13c9c9f.tar.gz
symfony-security-97faa986a60edadef4fc35fed239693ba13c9c9f.tar.bz2
Merge branch '2.2' into 2.3
* 2.2: [Locale] added support for the position argument to NumberFormatter::parse() [Locale] added some more stubs for the number formatter [Yaml] fixed typo [Yaml] fixed a test on PHP < 5.4 [DomCrawler]Crawler guess charset from html fixed PHP 5.3 compatibility [Yaml] reverted previous merge partially (refs #8897) [Security] remove unused logger [Security] fix typo [Yaml] Fixed filename in the ParseException message Conflicts: src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/Locale/Stub/StubNumberFormatter.php src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
-rw-r--r--Http/Firewall/AccessListener.php5
-rw-r--r--Http/FirewallMapInterface.php2
2 files changed, 2 insertions, 5 deletions
diff --git a/Http/Firewall/AccessListener.php b/Http/Firewall/AccessListener.php
index c3894ef..9349012 100644
--- a/Http/Firewall/AccessListener.php
+++ b/Http/Firewall/AccessListener.php
@@ -15,7 +15,6 @@ use Symfony\Component\Security\Core\SecurityContextInterface;
use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
use Symfony\Component\Security\Http\AccessMapInterface;
use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
-use Psr\Log\LoggerInterface;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
@@ -31,15 +30,13 @@ class AccessListener implements ListenerInterface
private $accessDecisionManager;
private $map;
private $authManager;
- private $logger;
- public function __construct(SecurityContextInterface $context, AccessDecisionManagerInterface $accessDecisionManager, AccessMapInterface $map, AuthenticationManagerInterface $authManager, LoggerInterface $logger = null)
+ public function __construct(SecurityContextInterface $context, AccessDecisionManagerInterface $accessDecisionManager, AccessMapInterface $map, AuthenticationManagerInterface $authManager)
{
$this->context = $context;
$this->accessDecisionManager = $accessDecisionManager;
$this->map = $map;
$this->authManager = $authManager;
- $this->logger = $logger;
}
/**
diff --git a/Http/FirewallMapInterface.php b/Http/FirewallMapInterface.php
index 336125f..1627ab5 100644
--- a/Http/FirewallMapInterface.php
+++ b/Http/FirewallMapInterface.php
@@ -24,7 +24,7 @@ interface FirewallMapInterface
* Returns the authentication listeners, and the exception listener to use
* for the given request.
*
- * If there are no authentication listeners, the first inner are must be
+ * If there are no authentication listeners, the first inner array must be
* empty.
*
* If there is no exception listener, the second element of the outer array