diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-18 23:02:40 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-18 23:02:40 +0200 |
| commit | df77b8aebb4e69fbf9cd862c279d29319713690a (patch) | |
| tree | 76d1a54fd02b6f717e5cdae669ece0bfe0a2874c | |
| parent | 50b628485926fe99395dc9c5b0f3d5d5b377222b (diff) | |
| parent | c70001ec82326f9581814ac002af6b904d24c4cd (diff) | |
| download | symfony-security-df77b8aebb4e69fbf9cd862c279d29319713690a.zip symfony-security-df77b8aebb4e69fbf9cd862c279d29319713690a.tar.gz symfony-security-df77b8aebb4e69fbf9cd862c279d29319713690a.tar.bz2 | |
Merge branch '2.4'
* 2.4:
Little correction for case 'ar'
No need to use mb functions here
Fix doc-blocks
Fix doc blocks
[HttpFoundation] update phpdoc of SessionHandlerInterface and unify parameters of all handlers according to interface
[Doctrine Bridge] fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite)
[Finder] Marked test skipped when ftp stream wrapper is not available
Conflicts:
src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
| -rw-r--r-- | Core/Authorization/Voter/ExpressionVoter.php | 2 | ||||
| -rw-r--r-- | Http/Firewall/SimpleFormAuthenticationListener.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Core/Authorization/Voter/ExpressionVoter.php b/Core/Authorization/Voter/ExpressionVoter.php index bf6683d..3263803 100644 --- a/Core/Authorization/Voter/ExpressionVoter.php +++ b/Core/Authorization/Voter/ExpressionVoter.php @@ -34,7 +34,7 @@ class ExpressionVoter implements VoterInterface * * @param ExpressionLanguage $expressionLanguage * @param AuthenticationTrustResolverInterface $trustResolver - * @param RoleHierarchyInterface $roleHierarchy + * @param RoleHierarchyInterface|null $roleHierarchy */ public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null) { diff --git a/Http/Firewall/SimpleFormAuthenticationListener.php b/Http/Firewall/SimpleFormAuthenticationListener.php index f79ce5c..f97cd59 100644 --- a/Http/Firewall/SimpleFormAuthenticationListener.php +++ b/Http/Firewall/SimpleFormAuthenticationListener.php @@ -50,8 +50,11 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener * successful, or failed authentication attempt * @param LoggerInterface $logger A LoggerInterface instance * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance - * @param SimpleFormAuthenticatorInterface $simpleAuthenticator A SimpleFormAuthenticatorInterface instance * @param CsrfTokenManagerInterface $csrfTokenManager A CsrfTokenManagerInterface instance + * @param SimpleFormAuthenticatorInterface $simpleAuthenticator A SimpleFormAuthenticatorInterface instance + * + * @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) { |