Merge branch '2.3'

* 2.3:
  [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

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