Skip to content

Commit d1e7059

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait` Fix CS
2 parents 5334280 + f4cbbb6 commit d1e7059

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

IpUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public static function checkIp6(?string $requestIp, string $ip)
146146
for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
147147
$left = $netmask - 16 * ($i - 1);
148148
$left = ($left <= 16) ? $left : 16;
149-
$mask = ~(0xffff >> $left) & 0xffff;
149+
$mask = ~(0xFFFF >> $left) & 0xFFFF;
150150
if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {
151151
return self::$checkedIps[$cacheKey] = false;
152152
}

Tests/ParameterBagTest.php

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

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

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

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

0 commit comments

Comments
 (0)