Merge branch '6.2' into 6.3

* 6.2:
  fix merge
  [DependencyInjection] Filter "container.excluded" services when using `findTaggedServiceIds()`
  [Cache] Removing null coalescing assignment operator on 5.4
  [Console] Add missing ZSH mention in DumpCompletionCommand help
  [Cache] Fix storing binary keys when using pgsql
  [FrameworkBundle] Add missing monolog channel tag for messenger services
  update documentation for telegram bridge notifier
  [FrameworkBundle] Improve documentation about translation:extract --sort option
  [VarDumper] Disable links for IntelliJ platform
  [Notifier] Add bridge documentation
  [HttpClient] Add hint about `timeout` and `max_duration` options
  [HttpFoundation] Use separate caches for IpUtils checkIp4 and checkIp6
  [FrameworkBundle] Fix wiring session.handler when handler_id is null
  [FrameworkBundle] Workflow - Fix LogicException about a wrong configuration of "enabled" node

Author: nicolas-grekas

IpUtils.php

@@ -74,7 +74,7 @@ public static function checkIp(string $requestIp, string|array $ips): bool
      */
     public static function checkIp4(string $requestIp, string $ip): bool
     {
-        $cacheKey = $requestIp.'-'.$ip;
+        $cacheKey = $requestIp.'-'.$ip.'-v4';
         if (isset(self::$checkedIps[$cacheKey])) {
             return self::$checkedIps[$cacheKey];
         }
@@ -119,7 +119,7 @@ public static function checkIp4(string $requestIp, string $ip): bool
      */
     public static function checkIp6(string $requestIp, string $ip): bool
     {
-        $cacheKey = $requestIp.'-'.$ip;
+        $cacheKey = $requestIp.'-'.$ip.'-v6';
         if (isset(self::$checkedIps[$cacheKey])) {
             return self::$checkedIps[$cacheKey];
         }

Session/Storage/Handler/NativeFileSessionHandler.php

@@ -45,7 +45,11 @@ public function __construct(string $savePath = null)
             throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $baseDir));
         }
 
-        ini_set('session.save_path', $savePath);
-        ini_set('session.save_handler', 'files');
+        if ($savePath !== \ini_get('session.save_path')) {
+            ini_set('session.save_path', $savePath);
+        }
+        if ('files' !== \ini_get('session.save_handler')) {
+            ini_set('session.save_handler', 'files');
+        }
     }
 }

Tests/IpUtilsTest.php

@@ -19,6 +19,21 @@ class IpUtilsTest extends TestCase
 {
     use ExpectDeprecationTrait;
 
+    public function testSeparateCachesPerProtocol()
+    {
+        $ip = '192.168.52.1';
+        $subnet = '192.168.0.0/16';
+
+        $this->assertFalse(IpUtils::checkIp6($ip, $subnet));
+        $this->assertTrue(IpUtils::checkIp4($ip, $subnet));
+
+        $ip = '2a01:198:603:0:396e:4789:8e99:890f';
+        $subnet = '2a01:198:603:0::/65';
+
+        $this->assertFalse(IpUtils::checkIp4($ip, $subnet));
+        $this->assertTrue(IpUtils::checkIp6($ip, $subnet));
+    }
+
     /**
      * @dataProvider getIpv4Data
      */