Skip to content

Commit 738118c

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [HttpFoundation] Always return strings from accept headers decode URL-encoded characters in DSN's usernames/passwords [Security/Http] cs fixes
2 parents 29856be + 662f1f3 commit 738118c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Signature/SignatureHasher.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ class SignatureHasher
3131
private ?int $maxUses;
3232

3333
/**
34-
* @param array $signatureProperties properties of the User; the hash is invalidated if these properties change
35-
* @param ExpiredSignatureStorage|null $expiredSignaturesStorage if provided, secures a sequence of hashes that are expired
36-
* @param int|null $maxUses used together with $expiredSignatureStorage to allow a maximum usage of a hash
34+
* @param array $signatureProperties Properties of the User; the hash is invalidated if these properties change
35+
* @param ExpiredSignatureStorage|null $expiredSignaturesStorage If provided, secures a sequence of hashes that are expired
36+
* @param int|null $maxUses Used together with $expiredSignatureStorage to allow a maximum usage of a hash
3737
*/
3838
public function __construct(PropertyAccessorInterface $propertyAccessor, array $signatureProperties, string $secret, ExpiredSignatureStorage $expiredSignaturesStorage = null, int $maxUses = null)
3939
{
@@ -47,8 +47,8 @@ public function __construct(PropertyAccessorInterface $propertyAccessor, array $
4747
/**
4848
* Verifies the hash using the provided user and expire time.
4949
*
50-
* @param int $expires the expiry time as a unix timestamp
51-
* @param string $hash the plaintext hash provided by the request
50+
* @param int $expires The expiry time as a unix timestamp
51+
* @param string $hash The plaintext hash provided by the request
5252
*
5353
* @throws InvalidSignatureException If the signature does not match the provided parameters
5454
* @throws ExpiredSignatureException If the signature is no longer valid
@@ -75,7 +75,7 @@ public function verifySignatureHash(UserInterface $user, int $expires, string $h
7575
/**
7676
* Computes the secure hash for the provided user and expire time.
7777
*
78-
* @param int $expires the expiry time as a unix timestamp
78+
* @param int $expires The expiry time as a unix timestamp
7979
*/
8080
public function computeSignatureHash(UserInterface $user, int $expires): string
8181
{

0 commit comments

Comments
 (0)