Skip to content

Commit fc8f530

Browse files
Merge branch '2.8' into 3.3
* 2.8: (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 ...
2 parents f4c7c35 + ae3fb7a commit fc8f530

26 files changed

+0
-52
lines changed

Authentication/AuthenticationProviderManager.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ class AuthenticationProviderManager implements AuthenticationManagerInterface
3535
private $eventDispatcher;
3636

3737
/**
38-
* Constructor.
39-
*
4038
* @param iterable|AuthenticationProviderInterface[] $providers An iterable with AuthenticationProviderInterface instances as values
4139
* @param bool $eraseCredentials Whether to erase credentials after authentication or not
4240
*

Authentication/AuthenticationTrustResolver.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac
2424
private $rememberMeClass;
2525

2626
/**
27-
* Constructor.
28-
*
2927
* @param string $anonymousClass
3028
* @param string $rememberMeClass
3129
*/

Authentication/Provider/AnonymousAuthenticationProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class AnonymousAuthenticationProvider implements AuthenticationProviderInterface
3131
private $secret;
3232

3333
/**
34-
* Constructor.
35-
*
3634
* @param string $secret The secret shared with the AnonymousToken
3735
*/
3836
public function __construct($secret)

Authentication/Provider/DaoAuthenticationProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider
3232
private $userProvider;
3333

3434
/**
35-
* Constructor.
36-
*
3735
* @param UserProviderInterface $userProvider An UserProviderInterface instance
3836
* @param UserCheckerInterface $userChecker An UserCheckerInterface instance
3937
* @param string $providerKey The provider key

Authentication/Provider/LdapBindAuthenticationProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class LdapBindAuthenticationProvider extends UserAuthenticationProvider
3636
private $queryString;
3737

3838
/**
39-
* Constructor.
40-
*
4139
* @param UserProviderInterface $userProvider A UserProvider
4240
* @param UserCheckerInterface $userChecker A UserChecker
4341
* @param string $providerKey The provider key

Authentication/Provider/PreAuthenticatedAuthenticationProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
3434
private $providerKey;
3535

3636
/**
37-
* Constructor.
38-
*
3937
* @param UserProviderInterface $userProvider An UserProviderInterface instance
4038
* @param UserCheckerInterface $userChecker An UserCheckerInterface instance
4139
* @param string $providerKey The provider key

Authentication/Provider/RememberMeAuthenticationProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ class RememberMeAuthenticationProvider implements AuthenticationProviderInterfac
2323
private $providerKey;
2424

2525
/**
26-
* Constructor.
27-
*
2826
* @param UserCheckerInterface $userChecker An UserCheckerInterface interface
2927
* @param string $secret A secret
3028
* @param string $providerKey A provider secret

Authentication/Provider/UserAuthenticationProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
3333
private $providerKey;
3434

3535
/**
36-
* Constructor.
37-
*
3836
* @param UserCheckerInterface $userChecker An UserCheckerInterface interface
3937
* @param string $providerKey A provider key
4038
* @param bool $hideUserNotFoundExceptions Whether to hide user not found exception or not

Authentication/RememberMe/PersistentToken.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ final class PersistentToken implements PersistentTokenInterface
2525
private $lastUsed;
2626

2727
/**
28-
* Constructor.
29-
*
3028
* @param string $class
3129
* @param string $username
3230
* @param string $series

Authentication/Token/AbstractToken.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ abstract class AbstractToken implements TokenInterface
3131
private $attributes = array();
3232

3333
/**
34-
* Constructor.
35-
*
3634
* @param (RoleInterface|string)[] $roles An array of roles
3735
*
3836
* @throws \InvalidArgumentException

Authentication/Token/AnonymousToken.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ class AnonymousToken extends AbstractToken
2323
private $secret;
2424

2525
/**
26-
* Constructor.
27-
*
2826
* @param string $secret A secret used to make sure the token is created by the app and not by a malicious client
2927
* @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string
3028
* @param Role[] $roles An array of roles

Authentication/Token/PreAuthenticatedToken.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ class PreAuthenticatedToken extends AbstractToken
2222
private $providerKey;
2323

2424
/**
25-
* Constructor.
26-
*
2725
* @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string
2826
* @param mixed $credentials The user credentials
2927
* @param string $providerKey The provider key

Authentication/Token/RememberMeToken.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class RememberMeToken extends AbstractToken
2424
private $providerKey;
2525

2626
/**
27-
* Constructor.
28-
*
2927
* @param UserInterface $user
3028
* @param string $providerKey
3129
* @param string $secret A secret used to make sure the token is created by the app and not by a malicious client

Authentication/Token/UsernamePasswordToken.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ class UsernamePasswordToken extends AbstractToken
2222
private $providerKey;
2323

2424
/**
25-
* Constructor.
26-
*
2725
* @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method
2826
* @param mixed $credentials This usually is the password of the user
2927
* @param string $providerKey The provider key

Authorization/AuthorizationChecker.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class AuthorizationChecker implements AuthorizationCheckerInterface
3131
private $alwaysAuthenticate;
3232

3333
/**
34-
* Constructor.
35-
*
3634
* @param TokenStorageInterface $tokenStorage
3735
* @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance
3836
* @param AccessDecisionManagerInterface $accessDecisionManager An AccessDecisionManager instance

Authorization/Voter/AuthenticatedVoter.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ class AuthenticatedVoter implements VoterInterface
3232
private $authenticationTrustResolver;
3333

3434
/**
35-
* Constructor.
36-
*
3735
* @param AuthenticationTrustResolverInterface $authenticationTrustResolver
3836
*/
3937
public function __construct(AuthenticationTrustResolverInterface $authenticationTrustResolver)

Authorization/Voter/ExpressionVoter.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class ExpressionVoter implements VoterInterface
3131
private $roleHierarchy;
3232

3333
/**
34-
* Constructor.
35-
*
3634
* @param ExpressionLanguage $expressionLanguage
3735
* @param AuthenticationTrustResolverInterface $trustResolver
3836
* @param RoleHierarchyInterface|null $roleHierarchy

Authorization/Voter/RoleVoter.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class RoleVoter implements VoterInterface
2424
private $prefix;
2525

2626
/**
27-
* Constructor.
28-
*
2927
* @param string $prefix The role prefix
3028
*/
3129
public function __construct($prefix = 'ROLE_')

Encoder/BCryptPasswordEncoder.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
2727
private $cost;
2828

2929
/**
30-
* Constructor.
31-
*
3230
* @param int $cost The algorithmic cost that should be used
3331
*
3432
* @throws \RuntimeException When no BCrypt encoder is available

Encoder/MessageDigestPasswordEncoder.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder
2525
private $iterations;
2626

2727
/**
28-
* Constructor.
29-
*
3028
* @param string $algorithm The digest algorithm to use
3129
* @param bool $encodeHashAsBase64 Whether to base64 encode the password hash
3230
* @param int $iterations The number of iterations to use to stretch the password hash

Encoder/Pbkdf2PasswordEncoder.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
3434
private $length;
3535

3636
/**
37-
* Constructor.
38-
*
3937
* @param string $algorithm The digest algorithm to use
4038
* @param bool $encodeHashAsBase64 Whether to base64 encode the password hash
4139
* @param int $iterations The number of iterations to use to stretch the password hash

Encoder/PlaintextPasswordEncoder.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ class PlaintextPasswordEncoder extends BasePasswordEncoder
2323
private $ignorePasswordCase;
2424

2525
/**
26-
* Constructor.
27-
*
2826
* @param bool $ignorePasswordCase Compare password case-insensitive
2927
*/
3028
public function __construct($ignorePasswordCase = false)

Role/Role.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ class Role implements RoleInterface
2121
private $role;
2222

2323
/**
24-
* Constructor.
25-
*
2624
* @param string $role The role name
2725
*/
2826
public function __construct($role)

Role/RoleHierarchy.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ class RoleHierarchy implements RoleHierarchyInterface
2222
protected $map;
2323

2424
/**
25-
* Constructor.
26-
*
2725
* @param array $hierarchy An array defining the hierarchy
2826
*/
2927
public function __construct(array $hierarchy)

Role/SwitchUserRole.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class SwitchUserRole extends Role
2424
private $source;
2525

2626
/**
27-
* Constructor.
28-
*
2927
* @param string $role The role as a string
3028
* @param TokenInterface $source The original token
3129
*/

User/InMemoryUserProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class InMemoryUserProvider implements UserProviderInterface
2727
private $users;
2828

2929
/**
30-
* Constructor.
31-
*
3230
* The user array is a hash where the keys are usernames and the values are
3331
* an array of attributes: 'password', 'enabled', and 'roles'.
3432
*

0 commit comments

Comments
 (0)