Merge branch '5.3' into 5.4

* 5.3:
  [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait`
  Fix CS
  [Intl] Update the ICU data to 70.1
  Default access_decision_manager.strategy option with merge.

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

IpUtils.php

@@ -160,7 +160,7 @@ public static function checkIp6(?string $requestIp, string $ip)
         for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
             $left = $netmask - 16 * ($i - 1);
             $left = ($left <= 16) ? $left : 16;
-            $mask = ~(0xffff >> $left) & 0xffff;
+            $mask = ~(0xFFFF >> $left) & 0xFFFF;
             if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {
                 return self::$checkedIps[$cacheKey] = false;
             }

Tests/ParameterBagTest.php

@@ -168,12 +168,12 @@ public function testFilter()
 
         $this->assertFalse($bag->filter('dec', '', \FILTER_VALIDATE_INT, [
             'flags' => \FILTER_FLAG_ALLOW_HEX,
-            'options' => ['min_range' => 1, 'max_range' => 0xff],
+            'options' => ['min_range' => 1, 'max_range' => 0xFF],
         ]), '->filter() gets a value of parameter as integer between boundaries');
 
         $this->assertFalse($bag->filter('hex', '', \FILTER_VALIDATE_INT, [
             'flags' => \FILTER_FLAG_ALLOW_HEX,
-            'options' => ['min_range' => 1, 'max_range' => 0xff],
+            'options' => ['min_range' => 1, 'max_range' => 0xFF],
         ]), '->filter() gets a value of parameter as integer between boundaries');
 
         $this->assertEquals(['bang'], $bag->filter('array', ''), '->filter() gets a value of parameter as an array');