Merge branch '7.1' into 7.2

* 7.1: (34 commits)
  improve amqp connection issues
  [Serializer] [ObjectNormalizer] Filter int when using FILTER_BOOL
  Fix #53778
  [PropertyInfo] Add missing test
  fix tests
  [Security][Validators] Review translations.
  [validator] Updated Dutch translation
  [FrameworkBundle] Fix wiring ConsoleProfilerListener
  [HttpKernel] Fix link to php doc
  [Validator] Update sr_Cyrl 120:This value is not a valid slug.
  [Validator] Update sr_Latn 120:This value is not a valid slug.
  6.4 Missing translations for Italian (it) #59419
  tests(notifier): avoid failing SNS test with local AWS configuration
  Fix typo ratio comment
  chore: PropertyAccess - fix typo in DocBlock
  [Validator] Missing translations for Brazilian Portuguese (pt_BR)
  fix(dependency-injection): reset env vars with kernel.reset
  [Translation][Validator] Review Russian translation (114 - 120)
  Review validator-related persian translation with id 120
  [Scheduler] Clarify description of exclusion time
  ...

Author: xabbuh

Loader/Configurator/RouteConfigurator.php

@@ -44,7 +44,14 @@ public function __construct(
      */
     final public function host(string|array $host): static
     {
+        $previousRoutes = clone $this->route;
         $this->addHost($this->route, $host);
+        foreach ($previousRoutes as $name => $route) {
+            if (!$this->route->get($name)) {
+                $this->collection->remove($name);
+            }
+        }
+        $this->collection->addCollection($this->route);
 
         return $this;
     }

Loader/XmlFileLoader.php

@@ -131,7 +131,7 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, st
             throw new \InvalidArgumentException(\sprintf('The <route> element in file "%s" must not have both a "path" attribute and <path> child nodes.', $path));
         }
 
-        $routes = $this->createLocalizedRoute($collection, $id, $paths ?: $node->getAttribute('path'));
+        $routes = $this->createLocalizedRoute(new RouteCollection(), $id, $paths ?: $node->getAttribute('path'));
         $routes->addDefaults($defaults);
         $routes->addRequirements($requirements);
         $routes->addOptions($options);
@@ -142,6 +142,8 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, st
         if (null !== $hosts) {
             $this->addHost($routes, $hosts);
         }
+
+        $collection->addCollection($routes);
     }
 
     /**

Loader/YamlFileLoader.php

@@ -155,7 +155,7 @@ protected function parseRoute(RouteCollection $collection, string $name, array $
             $defaults['_stateless'] = $config['stateless'];
         }
 
-        $routes = $this->createLocalizedRoute($collection, $name, $config['path']);
+        $routes = $this->createLocalizedRoute(new RouteCollection(), $name, $config['path']);
         $routes->addDefaults($defaults);
         $routes->addRequirements($requirements);
         $routes->addOptions($options);
@@ -166,6 +166,8 @@ protected function parseRoute(RouteCollection $collection, string $name, array $
         if (isset($config['host'])) {
             $this->addHost($routes, $config['host']);
         }
+
+        $collection->addCollection($routes);
     }
 
     /**

Tests/Fixtures/locale_and_host/route-with-hosts-expected-collection.php

@@ -0,0 +1,23 @@
+<?php
+
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+return function (string $format) {
+    $expectedRoutes = new RouteCollection();
+    $expectedRoutes->add('static.en', $route = new Route('/example'));
+    $route->setHost('www.example.com');
+    $route->setRequirement('_locale', 'en');
+    $route->setDefault('_locale', 'en');
+    $route->setDefault('_canonical_route', 'static');
+    $expectedRoutes->add('static.nl', $route = new Route('/example'));
+    $route->setHost('www.example.nl');
+    $route->setRequirement('_locale', 'nl');
+    $route->setDefault('_locale', 'nl');
+    $route->setDefault('_canonical_route', 'static');
+
+    $expectedRoutes->addResource(new FileResource(__DIR__."/route-with-hosts.$format"));
+
+    return $expectedRoutes;
+};

Tests/Fixtures/locale_and_host/route-with-hosts.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return function (RoutingConfigurator $routes) {
+    $routes->add('static', '/example')->host([
+        'nl' => 'www.example.nl',
+        'en' => 'www.example.com',
+    ]);
+};

Tests/Fixtures/locale_and_host/route-with-hosts.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        https://symfony.com/schema/routing/routing-1.0.xsd">
+    <route id="static" path="/example">
+        <host locale="nl">www.example.nl</host>
+        <host locale="en">www.example.com</host>
+    </route>
+</routes>

Tests/Fixtures/locale_and_host/route-with-hosts.yml

@@ -0,0 +1,6 @@
+---
+static:
+    path: /example
+    host:
+        nl: www.example.nl
+        en: www.example.com

Tests/Loader/PhpFileLoaderTest.php

@@ -317,6 +317,16 @@ public function testImportingRoutesWithSingleHostInImporter()
         $this->assertEquals($expectedRoutes('php'), $routes);
     }
 
+    public function testAddingRouteWithHosts()
+    {
+        $loader = new PhpFileLoader(new FileLocator([__DIR__.'/../Fixtures/locale_and_host']));
+        $routes = $loader->load('route-with-hosts.php');
+
+        $expectedRoutes = require __DIR__.'/../Fixtures/locale_and_host/route-with-hosts-expected-collection.php';
+
+        $this->assertEquals($expectedRoutes('php'), $routes);
+    }
+
     public function testImportingAliases()
     {
         $loader = new PhpFileLoader(new FileLocator([__DIR__.'/../Fixtures/alias']));

Tests/Loader/XmlFileLoaderTest.php

@@ -587,6 +587,16 @@ public function testImportingRoutesWithSingleHostsInImporter()
         $this->assertEquals($expectedRoutes('xml'), $routes);
     }
 
+    public function testAddingRouteWithHosts()
+    {
+        $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/locale_and_host']));
+        $routes = $loader->load('route-with-hosts.xml');
+
+        $expectedRoutes = require __DIR__.'/../Fixtures/locale_and_host/route-with-hosts-expected-collection.php';
+
+        $this->assertEquals($expectedRoutes('xml'), $routes);
+    }
+
     public function testWhenEnv()
     {
         $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']), 'some-env');

Tests/Loader/YamlFileLoaderTest.php

@@ -450,6 +450,16 @@ public function testImportingRoutesWithSingleHostInImporter()
         $this->assertEquals($expectedRoutes('yml'), $routes);
     }
 
+    public function testAddingRouteWithHosts()
+    {
+        $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/locale_and_host']));
+        $routes = $loader->load('route-with-hosts.yml');
+
+        $expectedRoutes = require __DIR__.'/../Fixtures/locale_and_host/route-with-hosts-expected-collection.php';
+
+        $this->assertEquals($expectedRoutes('yml'), $routes);
+    }
+
     public function testWhenEnv()
     {
         $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']), 'some-env');