Skip to content

Commit 927889a

Browse files
committed
Merge branch '3.4' into 4.3
* 3.4: chown and chgrp should also accept int as owner and group Fix RememberMe with null password [Validator] Fix plurals for sr_Latn (Serbian language written in latin script) validation messages [PhpUnitBridge][SymfonyTestsListenerTrait] Remove some unneeded code fix PHP const mapping keys using the inline notation Fix that no-cache requires positive validation with the origin, even for fresh responses
2 parents 79d20ad + eb3db77 commit 927889a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

RememberMe/TokenBasedRememberMeServices.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
9191
/**
9292
* Generates the cookie value.
9393
*
94-
* @param string $class
95-
* @param string $username The username
96-
* @param int $expires The Unix timestamp when the cookie expires
97-
* @param string $password The encoded password
94+
* @param string $class
95+
* @param string $username The username
96+
* @param int $expires The Unix timestamp when the cookie expires
97+
* @param string|null $password The encoded password
9898
*
9999
* @return string
100100
*/
@@ -113,10 +113,10 @@ protected function generateCookieValue($class, $username, $expires, $password)
113113
/**
114114
* Generates a hash for the cookie to ensure it is not being tampered with.
115115
*
116-
* @param string $class
117-
* @param string $username The username
118-
* @param int $expires The Unix timestamp when the cookie expires
119-
* @param string $password The encoded password
116+
* @param string $class
117+
* @param string $username The username
118+
* @param int $expires The Unix timestamp when the cookie expires
119+
* @param string|null $password The encoded password
120120
*
121121
* @return string
122122
*/

0 commit comments

Comments
 (0)