Skip to content

Commit b1cefe1

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: (27 commits) feat: add completion for DebugAutowiring search argument [Routing] Add support for aliasing routes [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait` Fix CS [Console] Open CompleteCommand for custom outputs [Intl] Update the ICU data to 70.1 [Messenger] Add completion for failed messages commands. Fix tests Fixing missing full_stack variable that's needed by toolbar.html.twig [PropertyInfo] Bump phpstan/phpdoc-parser [Security] Backport type fixes [VarExporter] escape unicode chars involved in directionality [Framework] Add completion to debug:container [Messenger] Add completion to command messenger:consume [Intl] Update the ICU data to 70.1 Fix more generic types Default access_decision_manager.strategy option with merge. Fix typos Update validators.ca.xlf Add missing Validator translations for Estonian ... Signed-off-by: Alexander M. Turek <me@derrabus.de>
2 parents e74bdf0 + 6c88b0b commit b1cefe1

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

HeaderBag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
*
1717
* @author Fabien Potencier <fabien@symfony.com>
1818
*
19-
* @implements \IteratorAggregate<string, array<int, string|null>>
19+
* @implements \IteratorAggregate<string, list<string|null>>
2020
*/
2121
class HeaderBag implements \IteratorAggregate, \Countable
2222
{
2323
protected const UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
2424
protected const LOWER = '-abcdefghijklmnopqrstuvwxyz';
2525

2626
/**
27-
* @var array<string, array<int, string|null>>
27+
* @var array<string, list<string|null>>
2828
*/
2929
protected $headers = [];
3030
protected $cacheControl = [];

IpUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public static function checkIp6(string $requestIp, string $ip): bool
138138
for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
139139
$left = $netmask - 16 * ($i - 1);
140140
$left = ($left <= 16) ? $left : 16;
141-
$mask = ~(0xffff >> $left) & 0xffff;
141+
$mask = ~(0xFFFF >> $left) & 0xFFFF;
142142
if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {
143143
return self::$checkedIps[$cacheKey] = false;
144144
}

Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ public function getPassword(): ?string
938938
/**
939939
* Gets the user info.
940940
*
941-
* @return string A user name and, optionally, scheme-specific information about how to gain authorization to access the server
941+
* @return string|null A user name if any and, optionally, scheme-specific information about how to gain authorization to access the server
942942
*/
943943
public function getUserInfo(): string
944944
{

Tests/ParameterBagTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@ public function testFilter()
165165

166166
$this->assertFalse($bag->filter('dec', '', \FILTER_VALIDATE_INT, [
167167
'flags' => \FILTER_FLAG_ALLOW_HEX,
168-
'options' => ['min_range' => 1, 'max_range' => 0xff],
168+
'options' => ['min_range' => 1, 'max_range' => 0xFF],
169169
]), '->filter() gets a value of parameter as integer between boundaries');
170170

171171
$this->assertFalse($bag->filter('hex', '', \FILTER_VALIDATE_INT, [
172172
'flags' => \FILTER_FLAG_ALLOW_HEX,
173-
'options' => ['min_range' => 1, 'max_range' => 0xff],
173+
'options' => ['min_range' => 1, 'max_range' => 0xFF],
174174
]), '->filter() gets a value of parameter as integer between boundaries');
175175

176176
$this->assertEquals(['bang'], $bag->filter('array', ''), '->filter() gets a value of parameter as an array');

0 commit comments

Comments
 (0)