Skip to content

Commit 165f4ec

Browse files
Merge branch '7.4' into 8.0
* 7.4: [ObjectMapper] handle non existing property errors Fix AsCronTask not passing arguments to command [HttpFoundation] Fix deprecation in tests on PHP 8.5 Fix typo [Cache] Bump ext-redis to 6.2 and ext-relay to 0.11 minimum [VarExporter] Dump implicit-nullable types as explicit to prevent the corresponding deprecation [DependencyInjection] CS fix chore: PHP CS Fixer fixes Leverage get_error_handler() Various CS fixes Allow mixed root on CompoundConstraintTestCase validator [Serializer] Fix readonly property initialization from incorrect scope Update BrevoRequestParser.php [JsonPath] Improve escape sequence validation in name selector
2 parents 0b33e4e + 03378f7 commit 165f4ec

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

Response.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public function sendHeaders(?int $statusCode = null): static
320320
if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
321321
$statusCode ??= $this->statusCode;
322322
trigger_deprecation('symfony/http-foundation', '7.4', 'Trying to use "%s::sendHeaders()" after headers have already been sent is deprecated will throw a PHP warning in 8.0. Use a "StreamedResponse" instead.', static::class);
323-
//header(\sprintf('HTTP/%s %s %s', $this->version, $statusCode, $this->statusText), true, $statusCode);
323+
// header(\sprintf('HTTP/%s %s %s', $this->version, $statusCode, $this->statusText), true, $statusCode);
324324
}
325325

326326
return $this;

Tests/StreamedResponseTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testConstructorWithChunks()
3232

3333
$buffer = '';
3434
ob_start(function (string $chunk) use (&$buffer) {
35-
$buffer .= $chunk;
35+
return $buffer .= $chunk;
3636
});
3737
$callback();
3838

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy