Merge branch '6.4' into 7.0

* 6.4:
  fix merge
  [VarDumper] Test intl formatter broken since dumper does not replace the nnbsp character by standard space
  [WebProfilerBundle] Fix intercept external redirects
  [Webhook] Added missing XML attribute in config XSD
  [String] Skip a test when an issue is detected in PCRE2
  [ExpressionLanguage] Fix null coalescing propagation
  [Mailer] Stop using the (local) AWS shared configuration in the PHPUnit tests.
  detect colors on not windows
  fix xterm detection
  refactor: hyper check
  Missing translations for Slovak (sk) #51954
  Remove redundant PHPdoc line
  properly handle SYMFONY_DOTENV_VARS being the empty string
  Avoid incompatibility with symfony/console 7
  bug #45057 [Messenger] Avoid reconnecting active Redis connections.
  [HttpKernel] Catch `TypeError` if the wrong type is used in `BackedEnumValueResolver`
  [Serializer] fix regression where nullable int cannot be serialized
  do not overwrite an application's default serialization context

Author: xabbuh

DependencyInjection/FrameworkExtension.php

@@ -1906,21 +1906,23 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $container->getDefinition('serializer.name_converter.metadata_aware')->setArgument(1, new Reference($config['name_converter']));
         }
 
+        $defaultContext = $config['default_context'] ?? [];
+
+        if ($defaultContext) {
+            $container->setParameter('serializer.default_context', $defaultContext);
+        }
+
         if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
             $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
-            $context = ($arguments[6] ?? []) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
+            $context = ($arguments[6] ?? $defaultContext) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
             $container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
             $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
         }
 
         if ($config['max_depth_handler'] ?? false) {
-            $defaultContext = $container->getDefinition('serializer.normalizer.object')->getArgument(6);
-            $defaultContext += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
-            $container->getDefinition('serializer.normalizer.object')->replaceArgument(6, $defaultContext);
-        }
-
-        if (isset($config['default_context']) && $config['default_context']) {
-            $container->setParameter('serializer.default_context', $config['default_context']);
+            $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
+            $context = ($arguments[6] ?? $defaultContext) + ['max_depth_handler' => new Reference($config['max_depth_handler'])];
+            $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
         }
     }
 

Resources/config/schema/symfony-1.0.xsd

@@ -953,6 +953,7 @@
             <xsd:element name="service" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="secret" type="xsd:string" minOccurs="0" maxOccurs="1" />
         </xsd:sequence>
+        <xsd:attribute name="type" type="xsd:string" use="required" />
     </xsd:complexType>
 
     <xsd:complexType name="remote-event">

Tests/Fixtures/Serializer/CircularReferenceHandler.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serializer;
+
+class CircularReferenceHandler
+{
+    public function __invoke()
+    {
+    }
+}

Tests/Fixtures/Serializer/MaxDepthHandler.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serializer;
+
+class MaxDepthHandler
+{
+    public function __invoke()
+    {
+    }
+}

Tests/Functional/app/Serializer/config.yml

@@ -6,6 +6,8 @@ framework:
     translator: true
     serializer:
         enabled: true
+        circular_reference_handler: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serializer\CircularReferenceHandler
+        max_depth_handler: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serializer\MaxDepthHandler
         default_context:
             enable_max_depth: true
             fake_context_option: foo
@@ -63,3 +65,7 @@ services:
     serializer.encoder.csv.alias:
         alias: serializer.encoder.csv
         public: true
+
+    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serializer\CircularReferenceHandler: ~
+
+    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Serializer\MaxDepthHandler: ~