Skip to content

Commit 7d81b81

Browse files
Merge branch '6.4' into 7.2
* 6.4: - CS fixes
2 parents 368a5e1 + 0341e41 commit 7d81b81

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

IpUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public static function anonymize(string $ip/* , int $v4Bytes = 1, int $v6Bytes =
196196
throw new \InvalidArgumentException('Cannot anonymize more than 4 bytes for IPv4 and 16 bytes for IPv6.');
197197
}
198198

199-
/**
199+
/*
200200
* If the IP contains a % symbol, then it is a local-link address with scoping according to RFC 4007
201201
* In that case, we only care about the part before the % symbol, as the following functions, can only work with
202202
* the IP address itself. As the scope can leak information (containing interface name), we do not want to

ResponseHeaderBag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public function getCookies(string $format = self::COOKIES_FLAT): array
221221
*/
222222
public function clearCookie(string $name, ?string $path = '/', ?string $domain = null, bool $secure = false, bool $httpOnly = true, ?string $sameSite = null /* , bool $partitioned = false */): void
223223
{
224-
$partitioned = 6 < \func_num_args() ? \func_get_arg(6) : false;
224+
$partitioned = 6 < \func_num_args() ? func_get_arg(6) : false;
225225

226226
$this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly, false, $sameSite, $partitioned));
227227
}

UriSigner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function __construct(
4646
*
4747
* The expiration is added as a query string parameter.
4848
*/
49-
public function sign(string $uri/*, \DateTimeInterface|\DateInterval|int|null $expiration = null*/): string
49+
public function sign(string $uri/* , \DateTimeInterface|\DateInterval|int|null $expiration = null */): string
5050
{
5151
$expiration = null;
5252

0 commit comments

Comments
 (0)