Merge branch '2.7' into 2.8

* 2.7: (22 commits)
  Tests and fix for issue in array model data in EntityType field with multiple=true
  [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
  removed useless PHPDoc
  [Form] Fix FormInterface::submit() annotation
  PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character > 4
  HttpCache does not consider ESI resources in HEAD requests
  Fix translation for "This field was not expected"
  [Routing] Enhance Route(Collection) docblocks
  Added improvement for accuracy in MoneyToLocalizedStringTransformer.
  Removed unused private property
  Use correct verb form in the pull request template
  Use PHP_MAXPATHLEN in Filesystem.
  Added null as explicit return type (?TokenInterface)
  [FrameworkBundle] Fix Routing\DelegatingLoader
  Render all line breaks according to the exception message
  [Form] Fix phpdoc
  [DI] remove confusing code
  [Form] Fixed GroupSequence with "constraints" option
  [Validator] Clarify UUID validator behavior
  [Filesystem] Fixed makePathRelative
  ...

Author: nicolas-grekas

AccessMap.php

@@ -25,8 +25,6 @@ class AccessMap implements AccessMapInterface
     private $map = array();
 
     /**
-     * Constructor.
-     *
      * @param RequestMatcherInterface $requestMatcher A RequestMatcherInterface instance
      * @param array                   $attributes     An array of attributes to pass to the access decision manager (like roles)
      * @param string|null             $channel        The channel to enforce (http, https, or null)

Authentication/CustomAuthenticationFailureHandler.php

@@ -22,8 +22,6 @@ class CustomAuthenticationFailureHandler implements AuthenticationFailureHandler
     private $handler;
 
     /**
-     * Constructor.
-     *
      * @param AuthenticationFailureHandlerInterface $handler An AuthenticationFailureHandlerInterface instance
      * @param array                                 $options Options for processing a successful authentication attempt
      */

Authentication/CustomAuthenticationSuccessHandler.php

@@ -22,8 +22,6 @@ class CustomAuthenticationSuccessHandler implements AuthenticationSuccessHandler
     private $handler;
 
     /**
-     * Constructor.
-     *
      * @param AuthenticationSuccessHandlerInterface $handler     An AuthenticationSuccessHandlerInterface instance
      * @param array                                 $options     Options for processing a successful authentication attempt
      * @param string                                $providerKey The provider key

Authentication/DefaultAuthenticationFailureHandler.php

@@ -43,8 +43,6 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle
     );
 
     /**
-     * Constructor.
-     *
      * @param HttpKernelInterface $httpKernel
      * @param HttpUtils           $httpUtils
      * @param array               $options    Options for processing a failed authentication attempt

Authentication/DefaultAuthenticationSuccessHandler.php

@@ -37,8 +37,6 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
     );
 
     /**
-     * Constructor.
-     *
      * @param HttpUtils $httpUtils
      * @param array     $options   Options for processing a successful authentication attempt
      */

Authentication/SimpleAuthenticationHandler.php

@@ -35,8 +35,6 @@ class SimpleAuthenticationHandler implements AuthenticationFailureHandlerInterfa
     protected $logger;
 
     /**
-     * Constructor.
-     *
      * @param SimpleAuthenticatorInterface          $authenticator  SimpleAuthenticatorInterface instance
      * @param AuthenticationSuccessHandlerInterface $successHandler Default success handler
      * @param AuthenticationFailureHandlerInterface $failureHandler Default failure handler

EntryPoint/FormAuthenticationEntryPoint.php

@@ -29,8 +29,6 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface
     private $httpUtils;
 
     /**
-     * Constructor.
-     *
      * @param HttpKernelInterface $kernel
      * @param HttpUtils           $httpUtils  An HttpUtils instance
      * @param string              $loginPath  The path to the login form

Event/InteractiveLoginEvent.php

@@ -16,8 +16,6 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
- * InteractiveLoginEvent.
- *
  * @author Fabien Potencier <[email protected]>
  */
 class InteractiveLoginEvent extends Event
@@ -26,8 +24,6 @@ class InteractiveLoginEvent extends Event
     private $authenticationToken;
 
     /**
-     * Constructor.
-     *
      * @param Request        $request             A Request instance
      * @param TokenInterface $authenticationToken A TokenInterface instance
      */

Firewall.php

@@ -34,8 +34,6 @@ class Firewall implements EventSubscriberInterface
     private $exceptionListeners;
 
     /**
-     * Constructor.
-     *
      * @param FirewallMapInterface     $map        A FirewallMapInterface instance
      * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
      */

Firewall/AbstractAuthenticationListener.php

@@ -64,8 +64,6 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
     private $rememberMeServices;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface                  $tokenStorage          A TokenStorageInterface instance
      * @param AuthenticationManagerInterface         $authenticationManager An AuthenticationManagerInterface instance
      * @param SessionAuthenticationStrategyInterface $sessionStrategy

Firewall/ContextListener.php

@@ -33,7 +33,6 @@
 class ContextListener implements ListenerInterface
 {
     private $tokenStorage;
-    private $contextKey;
     private $sessionKey;
     private $logger;
     private $userProviders;
@@ -54,7 +53,6 @@ public function __construct(TokenStorageInterface $tokenStorage, array $userProv
 
         $this->tokenStorage = $tokenStorage;
         $this->userProviders = $userProviders;
-        $this->contextKey = $contextKey;
         $this->sessionKey = '_security_'.$contextKey;
         $this->logger = $logger;
         $this->dispatcher = $dispatcher;
@@ -174,7 +172,7 @@ protected function refreshUser(TokenInterface $token)
         }
 
         if ($userNotFoundByProvider) {
-            return;
+            return null;
         }
 
         throw new \RuntimeException(sprintf('There is no user provider for user "%s".', get_class($user)));

Firewall/LogoutListener.php

@@ -41,8 +41,6 @@ class LogoutListener implements ListenerInterface
     private $csrfTokenManager;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface          $tokenStorage
      * @param HttpUtils                      $httpUtils        An HttpUtils instance
      * @param LogoutSuccessHandlerInterface  $successHandler   A LogoutSuccessHandlerInterface instance

Firewall/RememberMeListener.php

@@ -39,8 +39,6 @@ class RememberMeListener implements ListenerInterface
     private $sessionStrategy;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface                       $tokenStorage
      * @param RememberMeServicesInterface                 $rememberMeServices
      * @param AuthenticationManagerInterface              $authenticationManager

Firewall/SimpleFormAuthenticationListener.php

@@ -40,8 +40,6 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener
     private $csrfTokenManager;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface                  $tokenStorage          A TokenStorageInterface instance
      * @param AuthenticationManagerInterface         $authenticationManager An AuthenticationManagerInterface instance
      * @param SessionAuthenticationStrategyInterface $sessionStrategy

Firewall/SimplePreAuthenticationListener.php

@@ -40,8 +40,6 @@ class SimplePreAuthenticationListener implements ListenerInterface
     private $dispatcher;
 
     /**
-     * Constructor.
-     *
      * @param TokenStorageInterface           $tokenStorage          A TokenStorageInterface instance
      * @param AuthenticationManagerInterface  $authenticationManager An AuthenticationManagerInterface instance
      * @param string                          $providerKey

HttpUtils.php

@@ -31,8 +31,6 @@ class HttpUtils
     private $urlMatcher;
 
     /**
-     * Constructor.
-     *
      * @param UrlGeneratorInterface                       $urlGenerator A UrlGeneratorInterface instance
      * @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher   The URL or Request matcher
      *

Logout/CookieClearingLogoutHandler.php

@@ -25,8 +25,6 @@ class CookieClearingLogoutHandler implements LogoutHandlerInterface
     private $cookies;
 
     /**
-     * Constructor.
-     *
      * @param array $cookies An array of cookie names to unset
      */
     public function __construct(array $cookies)

RememberMe/AbstractRememberMeServices.php

@@ -44,8 +44,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     private $userProviders;
 
     /**
-     * Constructor.
-     *
      * @param array           $userProviders
      * @param string          $secret
      * @param string          $providerKey

RememberMe/PersistentTokenBasedRememberMeServices.php

@@ -34,8 +34,6 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices
     private $tokenProvider;
 
     /**
-     * Constructor.
-     *
      * Note: The $secureRandom parameter is deprecated since version 2.8 and will be removed in 3.0.
      *
      * @param array                 $userProviders