Merge branch '4.3' into 4.4

* 4.3: (26 commits)
  [Console] Fix #33915, Detect dimensions using mode CON if vt100 is supported
  [HttpKernel][DataCollectorInterface] Ease compatibility
  Add tests to ensure defaultLocale is properly passed to the URL generator
  [DependencyInjection] Fix broken references in tests
  [HttpClient] Retry safe requests when then fail before the body arrives
  Avoid using of kernel after shutdown
  Simplify PHP CS Fixer configuration
  [PropertyInfo] Fixed type extraction for nullable collections of non-nullable elements
  [FrameworkBundle] [HttpKernel] fixed correct EOL and EOM month
  [Serializer] Fix property name usage for denormalization
  Name test accordingly to the tested class
  Fix MockFileSessionStorageTest::sessionDir being used after it's unset
  bumped Symfony version to 4.3.7
  updated VERSION for 4.3.6
  updated CHANGELOG for 4.3.6
  bumped Symfony version to 3.4.34
  updated VERSION for 3.4.33
  update CONTRIBUTORS for 3.4.33
  updated CHANGELOG for 3.4.33
  [HttpClient] Fix perf issue when doing thousands of requests with curl
  ...

Author: nicolas-grekas

Router.php

@@ -363,7 +363,7 @@ function (ConfigCacheInterface $cache) {
             );
 
             if ($compiled) {
-                $this->generator = new $this->options['generator_class'](require $cache->getPath(), $this->context, $this->logger);
+                $this->generator = new $this->options['generator_class'](require $cache->getPath(), $this->context, $this->logger, $this->defaultLocale);
             } else {
                 if (!class_exists($this->options['generator_cache_class'], false)) {
                     require_once $cache->getPath();

Tests/RouterTest.php

@@ -22,10 +22,26 @@ class RouterTest extends TestCase
 
     private $loader = null;
 
+    private $cacheDir;
+
     protected function setUp(): void
     {
         $this->loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
         $this->router = new Router($this->loader, 'routing.yml');
+
+        $this->cacheDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('router_', true);
+    }
+
+    protected function tearDown(): void
+    {
+        if (is_dir($this->cacheDir)) {
+            array_map('unlink', glob($this->cacheDir.\DIRECTORY_SEPARATOR.'*'));
+            rmdir($this->cacheDir);
+        }
+
+        $this->loader = null;
+        $this->router = null;
+        $this->cacheDir = null;
     }
 
     public function testSetOptionsWithSupportedOptions()
@@ -132,4 +148,68 @@ public function testMatchRequestWithRequestMatcherInterface()
 
         $this->router->matchRequest(Request::create('/'));
     }
+
+    public function testDefaultLocaleIsPassedToGeneratorClass()
+    {
+        $this->loader->expects($this->once())
+            ->method('load')->with('routing.yml', null)
+            ->willReturn(new RouteCollection());
+
+        $router = new Router($this->loader, 'routing.yml', [
+            'cache_dir' => null,
+        ], null, null, 'hr');
+
+        $generator = $router->getGenerator();
+
+        $this->assertInstanceOf('Symfony\Component\Routing\Generator\UrlGeneratorInterface', $generator);
+
+        $p = new \ReflectionProperty($generator, 'defaultLocale');
+        $p->setAccessible(true);
+
+        $this->assertSame('hr', $p->getValue($generator));
+    }
+
+    public function testDefaultLocaleIsPassedToCompiledGeneratorCacheClass()
+    {
+        $this->loader->expects($this->once())
+            ->method('load')->with('routing.yml', null)
+            ->willReturn(new RouteCollection());
+
+        $router = new Router($this->loader, 'routing.yml', [
+            'cache_dir' => $this->cacheDir,
+        ], null, null, 'hr');
+
+        $generator = $router->getGenerator();
+
+        $this->assertInstanceOf('Symfony\Component\Routing\Generator\UrlGeneratorInterface', $generator);
+
+        $p = new \ReflectionProperty($generator, 'defaultLocale');
+        $p->setAccessible(true);
+
+        $this->assertSame('hr', $p->getValue($generator));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testDefaultLocaleIsPassedToNotCompiledGeneratorCacheClass()
+    {
+        $this->loader->expects($this->once())
+            ->method('load')->with('routing.yml', null)
+            ->willReturn(new RouteCollection());
+
+        $router = new Router($this->loader, 'routing.yml', [
+            'cache_dir' => $this->cacheDir,
+            'generator_class' => 'Symfony\Component\Routing\Generator\UrlGenerator',
+        ], null, null, 'hr');
+
+        $generator = $router->getGenerator();
+
+        $this->assertInstanceOf('Symfony\Component\Routing\Generator\UrlGeneratorInterface', $generator);
+
+        $p = new \ReflectionProperty($generator, 'defaultLocale');
+        $p->setAccessible(true);
+
+        $this->assertSame('hr', $p->getValue($generator));
+    }
 }