diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 10:02:57 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 10:02:57 +0200 |
commit | 3b378cf0eb09f4e34cfde24e29cda4f578fe6833 (patch) | |
tree | 3af3ef29ca707579cc8de674a8da0ff00e151701 /Core | |
parent | ef511d47c94ad92e37112b43efcbf7da8696a803 (diff) | |
parent | 74eaf535ddcd6cad834c68e7802cfcb08f400c1e (diff) | |
download | symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.zip symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.tar.gz symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.tar.bz2 |
Merge branch '2.3' into 2.4
* 2.3:
made {@inheritdoc} annotations consistent across the board
fixed types in phpdocs
made phpdoc types consistent with those defined in Hack
Add support Thai translations
made types consistent with those defined in Hack
removed extra/unsupported arguments
[HttpKernel] fixed an error message
[TwigBundle] removed undefined argument
[Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM.
Conflicts:
src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Console/Helper/DescriptorHelper.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
src/Symfony/Component/HttpFoundation/Response.php
src/Symfony/Component/HttpFoundation/StreamedResponse.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
src/Symfony/Component/Stopwatch/StopwatchPeriod.php
src/Symfony/Component/Translation/TranslatorInterface.php
src/Symfony/Component/Validator/ConstraintValidatorFactory.php
Diffstat (limited to 'Core')
33 files changed, 51 insertions, 51 deletions
diff --git a/Core/Authentication/AuthenticationProviderManager.php b/Core/Authentication/AuthenticationProviderManager.php index 8b7474b..f713e8f 100644 --- a/Core/Authentication/AuthenticationProviderManager.php +++ b/Core/Authentication/AuthenticationProviderManager.php @@ -38,7 +38,7 @@ class AuthenticationProviderManager implements AuthenticationManagerInterface * Constructor. * * @param AuthenticationProviderInterface[] $providers An array of AuthenticationProviderInterface instances - * @param Boolean $eraseCredentials Whether to erase credentials after authentication or not + * @param bool $eraseCredentials Whether to erase credentials after authentication or not * * @throws \InvalidArgumentException */ @@ -49,7 +49,7 @@ class AuthenticationProviderManager implements AuthenticationManagerInterface } $this->providers = $providers; - $this->eraseCredentials = (Boolean) $eraseCredentials; + $this->eraseCredentials = (bool) $eraseCredentials; } public function setEventDispatcher(EventDispatcherInterface $dispatcher) diff --git a/Core/Authentication/AuthenticationTrustResolver.php b/Core/Authentication/AuthenticationTrustResolver.php index 9b3ff3d..d030459 100644 --- a/Core/Authentication/AuthenticationTrustResolver.php +++ b/Core/Authentication/AuthenticationTrustResolver.php @@ -36,7 +36,7 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac } /** - * {@inheritDoc} + * {@inheritdoc} */ public function isAnonymous(TokenInterface $token = null) { @@ -48,7 +48,7 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac } /** - * {@inheritDoc} + * {@inheritdoc} */ public function isRememberMe(TokenInterface $token = null) { @@ -60,7 +60,7 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac } /** - * {@inheritDoc} + * {@inheritdoc} */ public function isFullFledged(TokenInterface $token = null) { diff --git a/Core/Authentication/Provider/DaoAuthenticationProvider.php b/Core/Authentication/Provider/DaoAuthenticationProvider.php index a9a2205..4913be8 100644 --- a/Core/Authentication/Provider/DaoAuthenticationProvider.php +++ b/Core/Authentication/Provider/DaoAuthenticationProvider.php @@ -38,7 +38,7 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider * @param UserCheckerInterface $userChecker An UserCheckerInterface instance * @param string $providerKey The provider key * @param EncoderFactoryInterface $encoderFactory An EncoderFactoryInterface instance - * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not + * @param bool $hideUserNotFoundExceptions Whether to hide user not found exception or not */ public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey, EncoderFactoryInterface $encoderFactory, $hideUserNotFoundExceptions = true) { diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php index 18c3e70..14fbdda 100644 --- a/Core/Authentication/Provider/UserAuthenticationProvider.php +++ b/Core/Authentication/Provider/UserAuthenticationProvider.php @@ -37,7 +37,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter * * @param UserCheckerInterface $userChecker An UserCheckerInterface interface * @param string $providerKey A provider key - * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not + * @param bool $hideUserNotFoundExceptions Whether to hide user not found exception or not * * @throws \InvalidArgumentException */ diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php index 5160fc5..84a92f1 100644 --- a/Core/Authentication/Token/AbstractToken.php +++ b/Core/Authentication/Token/AbstractToken.php @@ -127,7 +127,7 @@ abstract class AbstractToken implements TokenInterface */ public function setAuthenticated($authenticated) { - $this->authenticated = (Boolean) $authenticated; + $this->authenticated = (bool) $authenticated; } /** @@ -225,7 +225,7 @@ abstract class AbstractToken implements TokenInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function __toString() { @@ -247,7 +247,7 @@ abstract class AbstractToken implements TokenInterface } if ($this->user instanceof EquatableInterface) { - return ! (Boolean) $this->user->isEqualTo($user); + return ! (bool) $this->user->isEqualTo($user); } if ($this->user->getPassword() !== $user->getPassword()) { diff --git a/Core/Authentication/Token/AnonymousToken.php b/Core/Authentication/Token/AnonymousToken.php index d39fec8..571816c 100644 --- a/Core/Authentication/Token/AnonymousToken.php +++ b/Core/Authentication/Token/AnonymousToken.php @@ -57,7 +57,7 @@ class AnonymousToken extends AbstractToken } /** - * {@inheritDoc} + * {@inheritdoc} */ public function serialize() { @@ -65,7 +65,7 @@ class AnonymousToken extends AbstractToken } /** - * {@inheritDoc} + * {@inheritdoc} */ public function unserialize($serialized) { diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php index 11f69da..a909469 100644 --- a/Core/Authentication/Token/TokenInterface.php +++ b/Core/Authentication/Token/TokenInterface.php @@ -76,7 +76,7 @@ interface TokenInterface extends \Serializable /** * Sets the authenticated flag. * - * @param Boolean $isAuthenticated The authenticated flag + * @param bool $isAuthenticated The authenticated flag */ public function setAuthenticated($isAuthenticated); diff --git a/Core/Authorization/AccessDecisionManager.php b/Core/Authorization/AccessDecisionManager.php index 18c3569..726f62e 100644 --- a/Core/Authorization/AccessDecisionManager.php +++ b/Core/Authorization/AccessDecisionManager.php @@ -32,8 +32,8 @@ class AccessDecisionManager implements AccessDecisionManagerInterface * * @param VoterInterface[] $voters An array of VoterInterface instances * @param string $strategy The vote strategy - * @param Boolean $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not - * @param Boolean $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals + * @param bool $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not + * @param bool $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals * * @throws \InvalidArgumentException */ @@ -50,8 +50,8 @@ class AccessDecisionManager implements AccessDecisionManagerInterface $this->voters = $voters; $this->strategy = $strategyMethod; - $this->allowIfAllAbstainDecisions = (Boolean) $allowIfAllAbstainDecisions; - $this->allowIfEqualGrantedDeniedDecisions = (Boolean) $allowIfEqualGrantedDeniedDecisions; + $this->allowIfAllAbstainDecisions = (bool) $allowIfAllAbstainDecisions; + $this->allowIfEqualGrantedDeniedDecisions = (bool) $allowIfEqualGrantedDeniedDecisions; } /** diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php index 5a0f122..1dcf3a6 100644 --- a/Core/Encoder/BCryptPasswordEncoder.php +++ b/Core/Encoder/BCryptPasswordEncoder.php @@ -27,7 +27,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder /** * Constructor. * - * @param integer $cost The algorithmic cost that should be used + * @param int $cost The algorithmic cost that should be used * * @throws \RuntimeException When no BCrypt encoder is available * @throws \InvalidArgumentException if cost is out of range diff --git a/Core/Encoder/EncoderFactory.php b/Core/Encoder/EncoderFactory.php index 8bad61f..0337380 100644 --- a/Core/Encoder/EncoderFactory.php +++ b/Core/Encoder/EncoderFactory.php @@ -26,7 +26,7 @@ class EncoderFactory implements EncoderFactoryInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function getEncoder($user) { diff --git a/Core/Encoder/MessageDigestPasswordEncoder.php b/Core/Encoder/MessageDigestPasswordEncoder.php index a7e5546..9aa240a 100644 --- a/Core/Encoder/MessageDigestPasswordEncoder.php +++ b/Core/Encoder/MessageDigestPasswordEncoder.php @@ -28,8 +28,8 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder * Constructor. * * @param string $algorithm The digest algorithm to use - * @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash - * @param integer $iterations The number of iterations to use to stretch the password hash + * @param bool $encodeHashAsBase64 Whether to base64 encode the password hash + * @param int $iterations The number of iterations to use to stretch the password hash */ public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 5000) { diff --git a/Core/Encoder/Pbkdf2PasswordEncoder.php b/Core/Encoder/Pbkdf2PasswordEncoder.php index 8a5a958..55b5261 100644 --- a/Core/Encoder/Pbkdf2PasswordEncoder.php +++ b/Core/Encoder/Pbkdf2PasswordEncoder.php @@ -37,9 +37,9 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder * Constructor. * * @param string $algorithm The digest algorithm to use - * @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash - * @param integer $iterations The number of iterations to use to stretch the password hash - * @param integer $length Length of derived key to create + * @param bool $encodeHashAsBase64 Whether to base64 encode the password hash + * @param int $iterations The number of iterations to use to stretch the password hash + * @param int $length Length of derived key to create */ public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 1000, $length = 40) { diff --git a/Core/Encoder/PlaintextPasswordEncoder.php b/Core/Encoder/PlaintextPasswordEncoder.php index 22f3da4..bdb058a 100644 --- a/Core/Encoder/PlaintextPasswordEncoder.php +++ b/Core/Encoder/PlaintextPasswordEncoder.php @@ -25,7 +25,7 @@ class PlaintextPasswordEncoder extends BasePasswordEncoder /** * Constructor. * - * @param Boolean $ignorePasswordCase Compare password case-insensitive + * @param bool $ignorePasswordCase Compare password case-insensitive */ public function __construct($ignorePasswordCase = false) { diff --git a/Core/Exception/AccountExpiredException.php b/Core/Exception/AccountExpiredException.php index a5618ce..4a71263 100644 --- a/Core/Exception/AccountExpiredException.php +++ b/Core/Exception/AccountExpiredException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class AccountExpiredException extends AccountStatusException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/AccountStatusException.php b/Core/Exception/AccountStatusException.php index 7819e4d..9b29f63 100644 --- a/Core/Exception/AccountStatusException.php +++ b/Core/Exception/AccountStatusException.php @@ -45,7 +45,7 @@ abstract class AccountStatusException extends AuthenticationException } /** - * {@inheritDoc} + * {@inheritdoc} */ public function serialize() { @@ -56,7 +56,7 @@ abstract class AccountStatusException extends AuthenticationException } /** - * {@inheritDoc} + * {@inheritdoc} */ public function unserialize($str) { diff --git a/Core/Exception/AuthenticationCredentialsNotFoundException.php b/Core/Exception/AuthenticationCredentialsNotFoundException.php index 633b2be..8595bed 100644 --- a/Core/Exception/AuthenticationCredentialsNotFoundException.php +++ b/Core/Exception/AuthenticationCredentialsNotFoundException.php @@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception; class AuthenticationCredentialsNotFoundException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/AuthenticationServiceException.php b/Core/Exception/AuthenticationServiceException.php index 758a4f0..66f051d 100644 --- a/Core/Exception/AuthenticationServiceException.php +++ b/Core/Exception/AuthenticationServiceException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class AuthenticationServiceException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/BadCredentialsException.php b/Core/Exception/BadCredentialsException.php index 5deecca..be061c7 100644 --- a/Core/Exception/BadCredentialsException.php +++ b/Core/Exception/BadCredentialsException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class BadCredentialsException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/CookieTheftException.php b/Core/Exception/CookieTheftException.php index 8d9e154..af97168 100644 --- a/Core/Exception/CookieTheftException.php +++ b/Core/Exception/CookieTheftException.php @@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception; class CookieTheftException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/CredentialsExpiredException.php b/Core/Exception/CredentialsExpiredException.php index b9bf2d1..bcc1267 100644 --- a/Core/Exception/CredentialsExpiredException.php +++ b/Core/Exception/CredentialsExpiredException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class CredentialsExpiredException extends AccountStatusException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/DisabledException.php b/Core/Exception/DisabledException.php index 5571ab1..e9b784f 100644 --- a/Core/Exception/DisabledException.php +++ b/Core/Exception/DisabledException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class DisabledException extends AccountStatusException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/InsufficientAuthenticationException.php b/Core/Exception/InsufficientAuthenticationException.php index 74fc2b9..e33ef6a 100644 --- a/Core/Exception/InsufficientAuthenticationException.php +++ b/Core/Exception/InsufficientAuthenticationException.php @@ -22,7 +22,7 @@ namespace Symfony\Component\Security\Core\Exception; class InsufficientAuthenticationException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/InvalidCsrfTokenException.php b/Core/Exception/InvalidCsrfTokenException.php index ce0e1f4..84be855 100644 --- a/Core/Exception/InvalidCsrfTokenException.php +++ b/Core/Exception/InvalidCsrfTokenException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class InvalidCsrfTokenException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/LockedException.php b/Core/Exception/LockedException.php index 6532f70..fffae74 100644 --- a/Core/Exception/LockedException.php +++ b/Core/Exception/LockedException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class LockedException extends AccountStatusException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/NonceExpiredException.php b/Core/Exception/NonceExpiredException.php index 2f6681f..998e987 100644 --- a/Core/Exception/NonceExpiredException.php +++ b/Core/Exception/NonceExpiredException.php @@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception; class NonceExpiredException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/ProviderNotFoundException.php b/Core/Exception/ProviderNotFoundException.php index ea2b1fd..af2e1b5 100644 --- a/Core/Exception/ProviderNotFoundException.php +++ b/Core/Exception/ProviderNotFoundException.php @@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception; class ProviderNotFoundException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/SessionUnavailableException.php b/Core/Exception/SessionUnavailableException.php index 4b47b18..90b858a 100644 --- a/Core/Exception/SessionUnavailableException.php +++ b/Core/Exception/SessionUnavailableException.php @@ -26,7 +26,7 @@ namespace Symfony\Component\Security\Core\Exception; class SessionUnavailableException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/TokenNotFoundException.php b/Core/Exception/TokenNotFoundException.php index fb85abf..b050302 100644 --- a/Core/Exception/TokenNotFoundException.php +++ b/Core/Exception/TokenNotFoundException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class TokenNotFoundException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/UsernameNotFoundException.php b/Core/Exception/UsernameNotFoundException.php index f656bac..11607d3 100644 --- a/Core/Exception/UsernameNotFoundException.php +++ b/Core/Exception/UsernameNotFoundException.php @@ -22,7 +22,7 @@ class UsernameNotFoundException extends AuthenticationException private $username; /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { @@ -50,7 +50,7 @@ class UsernameNotFoundException extends AuthenticationException } /** - * {@inheritDoc} + * {@inheritdoc} */ public function serialize() { @@ -61,7 +61,7 @@ class UsernameNotFoundException extends AuthenticationException } /** - * {@inheritDoc} + * {@inheritdoc} */ public function unserialize($str) { diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php index c55cecf..0326f1d 100644 --- a/Core/SecurityContext.php +++ b/Core/SecurityContext.php @@ -36,7 +36,7 @@ class SecurityContext implements SecurityContextInterface * * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance * @param AccessDecisionManagerInterface|null $accessDecisionManager An AccessDecisionManager instance - * @param Boolean $alwaysAuthenticate + * @param bool $alwaysAuthenticate */ public function __construct(AuthenticationManagerInterface $authenticationManager, AccessDecisionManagerInterface $accessDecisionManager, $alwaysAuthenticate = false) { diff --git a/Core/User/ChainUserProvider.php b/Core/User/ChainUserProvider.php index fc72074..6e14a4f 100644 --- a/Core/User/ChainUserProvider.php +++ b/Core/User/ChainUserProvider.php @@ -40,7 +40,7 @@ class ChainUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function loadUserByUsername($username) { @@ -58,7 +58,7 @@ class ChainUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function refreshUser(UserInterface $user) { @@ -85,7 +85,7 @@ class ChainUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function supportsClass($class) { diff --git a/Core/User/InMemoryUserProvider.php b/Core/User/InMemoryUserProvider.php index 074c21e..624eb3d 100644 --- a/Core/User/InMemoryUserProvider.php +++ b/Core/User/InMemoryUserProvider.php @@ -81,7 +81,7 @@ class InMemoryUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function refreshUser(UserInterface $user) { @@ -93,7 +93,7 @@ class InMemoryUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function supportsClass($class) { diff --git a/Core/Util/SecureRandomInterface.php b/Core/Util/SecureRandomInterface.php index 2c35a72..2cf7779 100644 --- a/Core/Util/SecureRandomInterface.php +++ b/Core/Util/SecureRandomInterface.php @@ -21,7 +21,7 @@ interface SecureRandomInterface /** * Generates the specified number of secure random bytes. * - * @param integer $nbBytes + * @param int $nbBytes * * @return string */ |