Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 523bf27

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: removed dots at the end of @param and @return fixed typo
2 parents 17397d5 + b583bf8 commit 523bf27

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

Core/Authentication/Token/AnonymousToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken
2626
* Constructor.
2727
*
2828
* @param string $secret A secret used to make sure the token is created by the app and not by a malicious client
29-
* @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.
29+
* @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
3030
* @param RoleInterface[] $roles An array of roles
3131
*/
3232
public function __construct($secret, $user, array $roles = array())

Core/Authentication/Token/PreAuthenticatedToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PreAuthenticatedToken extends AbstractToken
2626
/**
2727
* Constructor.
2828
*
29-
* @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.
29+
* @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
3030
* @param mixed $credentials The user credentials
3131
* @param string $providerKey The provider key
3232
* @param RoleInterface[]|string[] $roles An array of roles

Core/Authentication/Token/TokenInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __toString();
3333
/**
3434
* Returns the user roles.
3535
*
36-
* @return RoleInterface[] An array of RoleInterface instances.
36+
* @return RoleInterface[] An array of RoleInterface instances
3737
*/
3838
public function getRoles();
3939

Core/Authentication/Token/UsernamePasswordToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class UsernamePasswordToken extends AbstractToken
2626
/**
2727
* Constructor.
2828
*
29-
* @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method.
29+
* @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method
3030
* @param string $credentials This usually is the password of the user
3131
* @param string $providerKey The provider key
3232
* @param RoleInterface[]|string[] $roles An array of roles

Core/User/InMemoryUserProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function supportsClass($class)
9797
/**
9898
* Returns the user by given username.
9999
*
100-
* @param string $username The username.
100+
* @param string $username The username
101101
*
102102
* @return User
103103
*

Http/Authentication/DefaultAuthenticationFailureHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle
4747
*
4848
* @param HttpKernelInterface $httpKernel
4949
* @param HttpUtils $httpUtils
50-
* @param array $options Options for processing a failed authentication attempt.
50+
* @param array $options Options for processing a failed authentication attempt
5151
* @param LoggerInterface $logger Optional logger
5252
*/
5353
public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = array(), LoggerInterface $logger = null)

Http/Authentication/DefaultAuthenticationSuccessHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
4040
* Constructor.
4141
*
4242
* @param HttpUtils $httpUtils
43-
* @param array $options Options for processing a successful authentication attempt.
43+
* @param array $options Options for processing a successful authentication attempt
4444
*/
4545
public function __construct(HttpUtils $httpUtils, array $options = array())
4646
{

0 commit comments

Comments
 (0)