Skip to content

Commit 13ff511

Browse files
Merge branch '3.4' into 4.3
* 3.4: Remove superfluous phpdoc tags
2 parents ff155a2 + 9f6673e commit 13ff511

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

Authentication/RememberMe/TokenProviderInterface.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ public function deleteTokenBySeries($series);
4141
/**
4242
* Updates the token according to this data.
4343
*
44-
* @param string $series
45-
* @param string $tokenValue
46-
* @param \DateTime $lastUsed
44+
* @param string $series
45+
* @param string $tokenValue
4746
*
4847
* @throws TokenNotFoundException if the token is not found
4948
*/

Authentication/Token/RememberMeToken.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ class RememberMeToken extends AbstractToken
2424
private $providerKey;
2525

2626
/**
27-
* @param UserInterface $user
28-
* @param string $providerKey
29-
* @param string $secret A secret used to make sure the token is created by the app and not by a malicious client
27+
* @param string $secret A secret used to make sure the token is created by the app and not by a malicious client
3028
*
3129
* @throws \InvalidArgumentException
3230
*/

Authorization/Voter/Voter.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ abstract protected function supports($attribute, $subject);
6060
* Perform a single access check operation on a given attribute, subject and token.
6161
* It is safe to assume that $attribute and $subject already passed the "supports()" method check.
6262
*
63-
* @param string $attribute
64-
* @param mixed $subject
65-
* @param TokenInterface $token
63+
* @param string $attribute
64+
* @param mixed $subject
6665
*
6766
* @return bool
6867
*/

User/LdapUserProvider.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ public function supportsClass($class)
116116
* Loads a user from an LDAP entry.
117117
*
118118
* @param string $username
119-
* @param Entry $entry
120119
*
121120
* @return User
122121
*/

0 commit comments

Comments
 (0)