Merge branch '2.2' into 2.3

* 2.2:
  Fix some annotates
  [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
  [HttpKernel] remove unneeded strtoupper
  updated the composer install command to reflect changes in Composer

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/Console/Input/InputDefinition.php
	src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
	src/Symfony/Component/Locale/Locale.php
	src/Symfony/Component/Locale/README.md
	src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php

Author: fabpot

EntryPoint/FormAuthenticationEntryPoint.php

@@ -53,7 +53,12 @@ public function start(Request $request, AuthenticationException $authException =
         if ($this->useForward) {
             $subRequest = $this->httpUtils->createRequest($request, $this->loginPath);
 
-            return $this->httpKernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
+            $response = $this->httpKernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
+            if (200 === $response->getStatusCode()) {
+                $response->headers->set('X-Status-Code', 401);
+            }
+
+            return $response;
         }
 
         return $this->httpUtils->createRedirectResponse($request, $this->loginPath);

Firewall/AbstractAuthenticationListener.php

@@ -93,6 +93,14 @@ public function __construct(SecurityContextInterface $securityContext, Authentic
         $this->failureHandler = $failureHandler;
         $this->options = array_merge(array(
             'check_path'                     => '/login_check',
+            'login_path'                     => '/login',
+            'always_use_default_target_path' => false,
+            'default_target_path'            => '/',
+            'target_path_parameter'          => '_target_path',
+            'use_referer'                    => false,
+            'failure_path'                   => null,
+            'failure_forward'                => false,
+            'require_previous_session'       => true,
         ), $options);
         $this->logger = $logger;
         $this->dispatcher = $dispatcher;
@@ -130,7 +138,7 @@ final public function handle(GetResponseEvent $event)
         }
 
         try {
-            if (!$request->hasPreviousSession()) {
+            if ($this->options['require_previous_session'] && !$request->hasPreviousSession()) {
                 throw new SessionUnavailableException('Your session has timed out, or you have disabled cookies.');
             }
 

Firewall/AnonymousAuthenticationListener.php

@@ -49,7 +49,7 @@ public function handle(GetResponseEvent $event)
         $this->context->setToken(new AnonymousToken($this->key, 'anon.', array()));
 
         if (null !== $this->logger) {
-            $this->logger->info(sprintf('Populated SecurityContext with an anonymous Token'));
+            $this->logger->info('Populated SecurityContext with an anonymous Token');
         }
     }
 }

Firewall/ExceptionListener.php

@@ -185,7 +185,7 @@ protected function setTargetPath(Request $request)
     {
         // session isn't required when using http basic authentication mechanism for example
         if ($request->hasSession() && $request->isMethodSafe()) {
-            $request->getSession()->set('_security.' . $this->providerKey . '.target_path', $request->getUri());
+            $request->getSession()->set('_security.'.$this->providerKey.'.target_path', $request->getUri());
         }
     }
 }