Merge branch '2.4'

fabpot · fabpot · commit 1caca1c76d49 · 2014-04-28T07:15:04.000+02:00
* 2.4: bumped Symfony version to 2.4.5 updated VERSION for 2.4.4 updated CHANGELOG for 2.4.4 bumped Symfony version to 2.3.14 updated VERSION for 2.3.13 update CONTRIBUTORS for 2.3.13 updated CHANGELOG for 2.3.13 Updated Serbian validation translation [Console] Fixed the rendering of exceptions on HHVM with a terminal width [WebProfilerBundle ] Fixed an edge case on WDT loading [Security] removed $csrfTokenManager type hint from SimpleFormAuthenticationListener constructor argument fixed typo [Process] Disable TTY mode on Windows platform [Validator] added missing ANNOTATION config to @target annotation [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator. Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/Firewall/SimpleFormAuthenticationListener.php b/Firewall/SimpleFormAuthenticationListener.php
@@ -56,7 +56,7 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener
      * @throws \InvalidArgumentException In case no simple authenticator is provided
      * @throws InvalidArgumentException  In case an invalid CSRF token manager is passed
      */
-    public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = array(), LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, CsrfTokenManagerInterface $csrfTokenManager = null, SimpleFormAuthenticatorInterface $simpleAuthenticator = null)
+    public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = array(), LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, $csrfTokenManager = null, SimpleFormAuthenticatorInterface $simpleAuthenticator = null)
     {
         if (!$simpleAuthenticator) {
             throw new \InvalidArgumentException('Missing simple authenticator');

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener`
`56`	`56`	`* @throws \InvalidArgumentException In case no simple authenticator is provided`
`57`	`57`	`* @throws InvalidArgumentException In case an invalid CSRF token manager is passed`
`58`	`58`	`*/`
`59`		- public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = array(), LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, CsrfTokenManagerInterface $csrfTokenManager = null, SimpleFormAuthenticatorInterface $simpleAuthenticator = null)
	`59`	+ public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, $providerKey, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options = array(), LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, $csrfTokenManager = null, SimpleFormAuthenticatorInterface $simpleAuthenticator = null)
`60`	`60`	`{`
`61`	`61`	`if (!$simpleAuthenticator) {`
`62`	`62`	`throw new \InvalidArgumentException('Missing simple authenticator');`