Skip to content

Commit 0b8c11f

Browse files
committed
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
2 parents ef0997c + 22e165c commit 0b8c11f

33 files changed

+51
-51
lines changed

Authentication/AuthenticationProviderManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class AuthenticationProviderManager implements AuthenticationManagerInterface
3838
* Constructor.
3939
*
4040
* @param AuthenticationProviderInterface[] $providers An array of AuthenticationProviderInterface instances
41-
* @param Boolean $eraseCredentials Whether to erase credentials after authentication or not
41+
* @param bool $eraseCredentials Whether to erase credentials after authentication or not
4242
*
4343
* @throws \InvalidArgumentException
4444
*/
@@ -49,7 +49,7 @@ public function __construct(array $providers, $eraseCredentials = true)
4949
}
5050

5151
$this->providers = $providers;
52-
$this->eraseCredentials = (Boolean) $eraseCredentials;
52+
$this->eraseCredentials = (bool) $eraseCredentials;
5353
}
5454

5555
public function setEventDispatcher(EventDispatcherInterface $dispatcher)

Authentication/AuthenticationTrustResolver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct($anonymousClass, $rememberMeClass)
3636
}
3737

3838
/**
39-
* {@inheritDoc}
39+
* {@inheritdoc}
4040
*/
4141
public function isAnonymous(TokenInterface $token = null)
4242
{
@@ -48,7 +48,7 @@ public function isAnonymous(TokenInterface $token = null)
4848
}
4949

5050
/**
51-
* {@inheritDoc}
51+
* {@inheritdoc}
5252
*/
5353
public function isRememberMe(TokenInterface $token = null)
5454
{
@@ -60,7 +60,7 @@ public function isRememberMe(TokenInterface $token = null)
6060
}
6161

6262
/**
63-
* {@inheritDoc}
63+
* {@inheritdoc}
6464
*/
6565
public function isFullFledged(TokenInterface $token = null)
6666
{

Authentication/Provider/DaoAuthenticationProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider
3838
* @param UserCheckerInterface $userChecker An UserCheckerInterface instance
3939
* @param string $providerKey The provider key
4040
* @param EncoderFactoryInterface $encoderFactory An EncoderFactoryInterface instance
41-
* @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not
41+
* @param bool $hideUserNotFoundExceptions Whether to hide user not found exception or not
4242
*/
4343
public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey, EncoderFactoryInterface $encoderFactory, $hideUserNotFoundExceptions = true)
4444
{

Authentication/Provider/UserAuthenticationProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
3737
*
3838
* @param UserCheckerInterface $userChecker An UserCheckerInterface interface
3939
* @param string $providerKey A provider key
40-
* @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not
40+
* @param bool $hideUserNotFoundExceptions Whether to hide user not found exception or not
4141
*
4242
* @throws \InvalidArgumentException
4343
*/

Authentication/Token/AbstractToken.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function isAuthenticated()
127127
*/
128128
public function setAuthenticated($authenticated)
129129
{
130-
$this->authenticated = (Boolean) $authenticated;
130+
$this->authenticated = (bool) $authenticated;
131131
}
132132

133133
/**
@@ -225,7 +225,7 @@ public function setAttribute($name, $value)
225225
}
226226

227227
/**
228-
* {@inheritDoc}
228+
* {@inheritdoc}
229229
*/
230230
public function __toString()
231231
{
@@ -247,7 +247,7 @@ private function hasUserChanged(UserInterface $user)
247247
}
248248

249249
if ($this->user instanceof EquatableInterface) {
250-
return ! (Boolean) $this->user->isEqualTo($user);
250+
return ! (bool) $this->user->isEqualTo($user);
251251
}
252252

253253
if ($this->user->getPassword() !== $user->getPassword()) {

Authentication/Token/AnonymousToken.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ public function getKey()
5757
}
5858

5959
/**
60-
* {@inheritDoc}
60+
* {@inheritdoc}
6161
*/
6262
public function serialize()
6363
{
6464
return serialize(array($this->key, parent::serialize()));
6565
}
6666

6767
/**
68-
* {@inheritDoc}
68+
* {@inheritdoc}
6969
*/
7070
public function unserialize($serialized)
7171
{

Authentication/Token/TokenInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function isAuthenticated();
7676
/**
7777
* Sets the authenticated flag.
7878
*
79-
* @param Boolean $isAuthenticated The authenticated flag
79+
* @param bool $isAuthenticated The authenticated flag
8080
*/
8181
public function setAuthenticated($isAuthenticated);
8282

Authorization/AccessDecisionManager.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
3232
*
3333
* @param VoterInterface[] $voters An array of VoterInterface instances
3434
* @param string $strategy The vote strategy
35-
* @param Boolean $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not
36-
* @param Boolean $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals
35+
* @param bool $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not
36+
* @param bool $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals
3737
*
3838
* @throws \InvalidArgumentException
3939
*/
@@ -50,8 +50,8 @@ public function __construct(array $voters, $strategy = 'affirmative', $allowIfAl
5050

5151
$this->voters = $voters;
5252
$this->strategy = $strategyMethod;
53-
$this->allowIfAllAbstainDecisions = (Boolean) $allowIfAllAbstainDecisions;
54-
$this->allowIfEqualGrantedDeniedDecisions = (Boolean) $allowIfEqualGrantedDeniedDecisions;
53+
$this->allowIfAllAbstainDecisions = (bool) $allowIfAllAbstainDecisions;
54+
$this->allowIfEqualGrantedDeniedDecisions = (bool) $allowIfEqualGrantedDeniedDecisions;
5555
}
5656

5757
/**

Encoder/BCryptPasswordEncoder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
2727
/**
2828
* Constructor.
2929
*
30-
* @param integer $cost The algorithmic cost that should be used
30+
* @param int $cost The algorithmic cost that should be used
3131
*
3232
* @throws \RuntimeException When no BCrypt encoder is available
3333
* @throws \InvalidArgumentException if cost is out of range

Encoder/EncoderFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function __construct(array $encoders)
2626
}
2727

2828
/**
29-
* {@inheritDoc}
29+
* {@inheritdoc}
3030
*/
3131
public function getEncoder($user)
3232
{

Encoder/MessageDigestPasswordEncoder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder
2828
* Constructor.
2929
*
3030
* @param string $algorithm The digest algorithm to use
31-
* @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash
32-
* @param integer $iterations The number of iterations to use to stretch the password hash
31+
* @param bool $encodeHashAsBase64 Whether to base64 encode the password hash
32+
* @param int $iterations The number of iterations to use to stretch the password hash
3333
*/
3434
public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 5000)
3535
{

Encoder/Pbkdf2PasswordEncoder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
3737
* Constructor.
3838
*
3939
* @param string $algorithm The digest algorithm to use
40-
* @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash
41-
* @param integer $iterations The number of iterations to use to stretch the password hash
42-
* @param integer $length Length of derived key to create
40+
* @param bool $encodeHashAsBase64 Whether to base64 encode the password hash
41+
* @param int $iterations The number of iterations to use to stretch the password hash
42+
* @param int $length Length of derived key to create
4343
*/
4444
public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 1000, $length = 40)
4545
{

Encoder/PlaintextPasswordEncoder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class PlaintextPasswordEncoder extends BasePasswordEncoder
2525
/**
2626
* Constructor.
2727
*
28-
* @param Boolean $ignorePasswordCase Compare password case-insensitive
28+
* @param bool $ignorePasswordCase Compare password case-insensitive
2929
*/
3030
public function __construct($ignorePasswordCase = false)
3131
{

Exception/AccountExpiredException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class AccountExpiredException extends AccountStatusException
2121
{
2222
/**
23-
* {@inheritDoc}
23+
* {@inheritdoc}
2424
*/
2525
public function getMessageKey()
2626
{

Exception/AccountStatusException.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function setUser(UserInterface $user)
4545
}
4646

4747
/**
48-
* {@inheritDoc}
48+
* {@inheritdoc}
4949
*/
5050
public function serialize()
5151
{
@@ -56,7 +56,7 @@ public function serialize()
5656
}
5757

5858
/**
59-
* {@inheritDoc}
59+
* {@inheritdoc}
6060
*/
6161
public function unserialize($str)
6262
{

Exception/AuthenticationCredentialsNotFoundException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class AuthenticationCredentialsNotFoundException extends AuthenticationException
2222
{
2323
/**
24-
* {@inheritDoc}
24+
* {@inheritdoc}
2525
*/
2626
public function getMessageKey()
2727
{

Exception/AuthenticationServiceException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class AuthenticationServiceException extends AuthenticationException
2121
{
2222
/**
23-
* {@inheritDoc}
23+
* {@inheritdoc}
2424
*/
2525
public function getMessageKey()
2626
{

Exception/BadCredentialsException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class BadCredentialsException extends AuthenticationException
2121
{
2222
/**
23-
* {@inheritDoc}
23+
* {@inheritdoc}
2424
*/
2525
public function getMessageKey()
2626
{

Exception/CookieTheftException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class CookieTheftException extends AuthenticationException
2222
{
2323
/**
24-
* {@inheritDoc}
24+
* {@inheritdoc}
2525
*/
2626
public function getMessageKey()
2727
{

Exception/CredentialsExpiredException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class CredentialsExpiredException extends AccountStatusException
2121
{
2222
/**
23-
* {@inheritDoc}
23+
* {@inheritdoc}
2424
*/
2525
public function getMessageKey()
2626
{

Exception/DisabledException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class DisabledException extends AccountStatusException
2121
{
2222
/**
23-
* {@inheritDoc}
23+
* {@inheritdoc}
2424
*/
2525
public function getMessageKey()
2626
{

Exception/InsufficientAuthenticationException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
class InsufficientAuthenticationException extends AuthenticationException
2323
{
2424
/**
25-
* {@inheritDoc}
25+
* {@inheritdoc}
2626
*/
2727
public function getMessageKey()
2828
{

Exception/InvalidCsrfTokenException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class InvalidCsrfTokenException extends AuthenticationException
2121
{
2222
/**
23-
* {@inheritDoc}
23+
* {@inheritdoc}
2424
*/
2525
public function getMessageKey()
2626
{

Exception/LockedException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class LockedException extends AccountStatusException
2121
{
2222
/**
23-
* {@inheritDoc}
23+
* {@inheritdoc}
2424
*/
2525
public function getMessageKey()
2626
{

Exception/NonceExpiredException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class NonceExpiredException extends AuthenticationException
2222
{
2323
/**
24-
* {@inheritDoc}
24+
* {@inheritdoc}
2525
*/
2626
public function getMessageKey()
2727
{

Exception/ProviderNotFoundException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class ProviderNotFoundException extends AuthenticationException
2222
{
2323
/**
24-
* {@inheritDoc}
24+
* {@inheritdoc}
2525
*/
2626
public function getMessageKey()
2727
{

Exception/SessionUnavailableException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
class SessionUnavailableException extends AuthenticationException
2727
{
2828
/**
29-
* {@inheritDoc}
29+
* {@inheritdoc}
3030
*/
3131
public function getMessageKey()
3232
{

Exception/TokenNotFoundException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class TokenNotFoundException extends AuthenticationException
2121
{
2222
/**
23-
* {@inheritDoc}
23+
* {@inheritdoc}
2424
*/
2525
public function getMessageKey()
2626
{

Exception/UsernameNotFoundException.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class UsernameNotFoundException extends AuthenticationException
2222
private $username;
2323

2424
/**
25-
* {@inheritDoc}
25+
* {@inheritdoc}
2626
*/
2727
public function getMessageKey()
2828
{
@@ -50,7 +50,7 @@ public function setUsername($username)
5050
}
5151

5252
/**
53-
* {@inheritDoc}
53+
* {@inheritdoc}
5454
*/
5555
public function serialize()
5656
{
@@ -61,7 +61,7 @@ public function serialize()
6161
}
6262

6363
/**
64-
* {@inheritDoc}
64+
* {@inheritdoc}
6565
*/
6666
public function unserialize($str)
6767
{

SecurityContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class SecurityContext implements SecurityContextInterface
3636
*
3737
* @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance
3838
* @param AccessDecisionManagerInterface|null $accessDecisionManager An AccessDecisionManager instance
39-
* @param Boolean $alwaysAuthenticate
39+
* @param bool $alwaysAuthenticate
4040
*/
4141
public function __construct(AuthenticationManagerInterface $authenticationManager, AccessDecisionManagerInterface $accessDecisionManager, $alwaysAuthenticate = false)
4242
{

User/ChainUserProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function getProviders()
4040
}
4141

4242
/**
43-
* {@inheritDoc}
43+
* {@inheritdoc}
4444
*/
4545
public function loadUserByUsername($username)
4646
{
@@ -58,7 +58,7 @@ public function loadUserByUsername($username)
5858
}
5959

6060
/**
61-
* {@inheritDoc}
61+
* {@inheritdoc}
6262
*/
6363
public function refreshUser(UserInterface $user)
6464
{
@@ -85,7 +85,7 @@ public function refreshUser(UserInterface $user)
8585
}
8686

8787
/**
88-
* {@inheritDoc}
88+
* {@inheritdoc}
8989
*/
9090
public function supportsClass($class)
9191
{

0 commit comments

Comments
 (0)