Merge branch '6.4' into 7.0

derrabus · derrabus · commit 5cfc1f348062 · 2023-09-18T12:43:19.000+02:00
* 6.4:
  Fix incompatibility between security-bundle 6.4 and security-http 7.0
  [String] Update wcswidth data with Unicode 15.1
  [FrameworkBundle] no serializer mapping cache in debug mode without enable_annotations
  [Cache] fix using multiple Redis Sentinel hosts when the first one is not resolvable
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1818,16 +1818,16 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('serializer.normalizer.mime_message');
         }
 
+        if ($container->getParameter('kernel.debug')) {
+            $container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
+        }
+
         if (!class_exists(Translator::class)) {
             $container->removeDefinition('serializer.normalizer.translatable');
         }
 
         $serializerLoaders = [];
         if (isset($config['enable_attributes']) && $config['enable_attributes']) {
-            if ($container->getParameter('kernel.debug')) {
-                $container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
-            }
-
             $annotationLoader = new Definition(AnnotationLoader::class);
 
             $serializerLoaders[] = $annotationLoader;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -1548,6 +1548,12 @@ public function testSerializerCacheActivated()
     public function testSerializerCacheUsedWithoutAnnotationsAndMappingFiles()
     {
         $container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
+        $this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
+    }
+
+    public function testSerializerCacheUsedWithoutAnnotationsAndMappingFilesNoDebug()
+    {
+        $container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => false, 'kernel.container_class' => __CLASS__]);
         $this->assertTrue($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
     }
 
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -227,8 +227,11 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                     }
                     $sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
 
-                    if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
-                        [$host, $port] = $address;
+                    try {
+                        if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
+                            [$host, $port] = $address;
+                        }
+                    } catch (\RedisException $e) {
                     }
                 } while (++$hostIndex < \count($hosts) && !$address);
 
diff --git a/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php b/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php
@@ -46,7 +46,7 @@ private function writeWideWidthData(): void
 
         $version = $matches[1];
 
-        if (!preg_match_all('/^([A-H\d]{4,})(?:\.\.([A-H\d]{4,}))?;[W|F]/m', $content, $matches, \PREG_SET_ORDER)) {
+        if (!preg_match_all('/^([A-H\d]{4,})(?:\.\.([A-H\d]{4,}))? +; [W|F]/m', $content, $matches, \PREG_SET_ORDER)) {
             throw new RuntimeException('The wide width pattern did not match anything.');
         }
 
diff --git a/src/Symfony/Component/String/Resources/data/wcswidth_table_wide.php b/src/Symfony/Component/String/Resources/data/wcswidth_table_wide.php
@@ -3,8 +3,8 @@
 /*
  * This file has been auto-generated by the Symfony String Component for internal use.
  *
- * Unicode version: 15.0.0
- * Date: 2022-10-05T17:16:36+02:00
+ * Unicode version: 15.1.0
+ * Date: 2023-09-13T11:47:12+00:00
  */
 
 return [
@@ -166,7 +166,7 @@
     ],
     [
         12272,
-        12283,
+        12287,
     ],
     [
         12288,
@@ -396,6 +396,10 @@
         12736,
         12771,
     ],
+    [
+        12783,
+        12783,
+    ],
     [
         12784,
         12799,
@@ -1110,6 +1114,14 @@
     ],
     [
         191457,
+        191471,
+    ],
+    [
+        191472,
+        192093,
+    ],
+    [
+        192094,
         194559,
     ],
     [
diff --git a/src/Symfony/Component/String/Resources/data/wcswidth_table_zero.php b/src/Symfony/Component/String/Resources/data/wcswidth_table_zero.php
@@ -3,8 +3,8 @@
 /*
  * This file has been auto-generated by the Symfony String Component for internal use.
  *
- * Unicode version: 15.0.0
- * Date: 2022-10-05T17:16:37+02:00
+ * Unicode version: 15.1.0
+ * Date: 2023-09-13T11:47:13+00:00
  */
 
 return [

Original file line number	Diff line number	Diff line change
`@@ -1548,6 +1548,12 @@ public function testSerializerCacheActivated()`
`1548`	`1548`	`public function testSerializerCacheUsedWithoutAnnotationsAndMappingFiles()`
`1549`	`1549`	`{`
`1550`	`1550`	`$container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);`
	`1551`	`+ $this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));`
	`1552`	`+ }`
	`1553`	`+`
	`1554`	`+ public function testSerializerCacheUsedWithoutAnnotationsAndMappingFilesNoDebug()`
	`1555`	`+ {`
	`1556`	`+ $container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => false, 'kernel.container_class' => __CLASS__]);`
`1551`	`1557`	`$this->assertTrue($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));`
`1552`	`1558`	`}`
`1553`	`1559`
Original file line number	Diff line number	Diff line change
`@@ -227,8 +227,11 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra`
`227`	`227`	`}`
`228`	`228`	`$sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);`
`229`	`229`
`230`		`- if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {`
`231`		`- [$host, $port] = $address;`
	`230`	`+ try {`
	`231`	`+ if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {`
	`232`	`+ [$host, $port] = $address;`
	`233`	`+ }`
	`234`	`+ } catch (\RedisException $e) {`
`232`	`235`	`}`
`233`	`236`	`} while (++$hostIndex < \count($hosts) && !$address);`
`234`	`237`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ private function writeWideWidthData(): void`
`46`	`46`
`47`	`47`	`$version = $matches[1];`
`48`	`48`
`49`		`- if (!preg_match_all('/^([A-H\d]{4,})(?:\.\.([A-H\d]{4,}))?;[W\|F]/m', $content, $matches, \PREG_SET_ORDER)) {`
	`49`	`+ if (!preg_match_all('/^([A-H\d]{4,})(?:\.\.([A-H\d]{4,}))? +; [W\|F]/m', $content, $matches, \PREG_SET_ORDER)) {`
`50`	`50`	`throw new RuntimeException('The wide width pattern did not match anything.');`
`51`	`51`	`}`
`52`	`52`