Merge branch '5.2' into 5.x

* 5.2:
  [ErrorHandler] Fix error caused by `include` + open_basedir
  [FrameworkBundle] Make the TestBrowserToken interchangeable with other tokens
  [Console] ProgressBar clears too many lines on update
  [FrameworkBundle] Exclude unreadable files when executing About command
  [Bridge\Twig] Add 'form-control-range' for range input type
  Be explicit about transparent background color of links in toolbar
  [Translation] fix test case name
  [Cache] Fix wrong namespace in test
  [DependencyInjection] Fix return type

Author: nicolas-grekas

Command/AboutCommand.php

@@ -114,7 +114,9 @@ private static function formatFileSize(string $path): string
         } else {
             $size = 0;
             foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS | \RecursiveDirectoryIterator::FOLLOW_SYMLINKS)) as $file) {
-                $size += $file->getSize();
+                if ($file->isReadable()) {
+                    $size += $file->getSize();
+                }
             }
         }
 

KernelBrowser.php

@@ -120,7 +120,7 @@ public function loginUser($user, string $firewallContext = 'main'): self
             throw new \LogicException(sprintf('The first argument of "%s" must be instance of "%s", "%s" provided.', __METHOD__, UserInterface::class, \is_object($user) ? \get_class($user) : \gettype($user)));
         }
 
-        $token = new TestBrowserToken($user->getRoles(), $user);
+        $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);
         $token->setAuthenticated(true);
         $session = $this->getContainer()->get('test.service_container')->get('session.factory')->createSession();
         $session->set('_security_'.$firewallContext, serialize($token));

Test/TestBrowserToken.php

@@ -21,13 +21,22 @@
  */
 class TestBrowserToken extends AbstractToken
 {
-    public function __construct(array $roles = [], UserInterface $user = null)
+    private $firewallName;
+
+    public function __construct(array $roles = [], UserInterface $user = null, string $firewallName = 'main')
     {
         parent::__construct($roles);
 
         if (null !== $user) {
             $this->setUser($user);
         }
+
+        $this->firewallName = $firewallName;
+    }
+
+    public function getFirewallName(): string
+    {
+        return $this->firewallName;
     }
 
     public function getCredentials()

Tests/Command/AboutCommand/AboutCommandTest.php

@@ -0,0 +1,90 @@
+<?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\Command\AboutCommand;
+
+use Symfony\Bundle\FrameworkBundle\Command\AboutCommand;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Tests\Command\AboutCommand\Fixture\TestAppKernel;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Filesystem\Exception\IOException;
+use Symfony\Component\Filesystem\Filesystem;
+
+class AboutCommandTest extends TestCase
+{
+    /** @var Filesystem */
+    private $fs;
+
+    protected function setUp(): void
+    {
+        $this->fs = new Filesystem();
+    }
+
+    public function testAboutWithReadableFiles()
+    {
+        $kernel = new TestAppKernel('test', true);
+        $this->fs->mkdir($kernel->getProjectDir());
+
+        $this->fs->dumpFile($kernel->getCacheDir().'/readable_file', 'The file content.');
+        $this->fs->chmod($kernel->getCacheDir().'/readable_file', 0777);
+
+        $tester = $this->createCommandTester($kernel);
+        $ret = $tester->execute([]);
+
+        $this->assertSame(0, $ret);
+        $this->assertStringContainsString('Cache directory', $tester->getDisplay());
+        $this->assertStringContainsString('Log directory', $tester->getDisplay());
+
+        $this->fs->chmod($kernel->getCacheDir().'/readable_file', 0777);
+
+        try {
+            $this->fs->remove($kernel->getProjectDir());
+        } catch (IOException $e) {
+        }
+    }
+
+    public function testAboutWithUnreadableFiles()
+    {
+        $kernel = new TestAppKernel('test', true);
+        $this->fs->mkdir($kernel->getProjectDir());
+
+        // skip test on Windows; PHP can't easily set file as unreadable on Windows
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('This test cannot run on Windows.');
+        }
+
+        $this->fs->dumpFile($kernel->getCacheDir().'/unreadable_file', 'The file content.');
+        $this->fs->chmod($kernel->getCacheDir().'/unreadable_file', 0222);
+
+        $tester = $this->createCommandTester($kernel);
+        $ret = $tester->execute([]);
+
+        $this->assertSame(0, $ret);
+        $this->assertStringContainsString('Cache directory', $tester->getDisplay());
+        $this->assertStringContainsString('Log directory', $tester->getDisplay());
+
+        $this->fs->chmod($kernel->getCacheDir().'/unreadable_file', 0777);
+
+        try {
+            $this->fs->remove($kernel->getProjectDir());
+        } catch (IOException $e) {
+        }
+    }
+
+    private function createCommandTester(TestAppKernel $kernel): CommandTester
+    {
+        $application = new Application($kernel);
+        $application->add(new AboutCommand());
+
+        return new CommandTester($application->find('about'));
+    }
+}

Tests/Command/AboutCommand/Fixture/TestAppKernel.php

@@ -0,0 +1,40 @@
+<?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\Command\AboutCommand\Fixture;
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel;
+
+class TestAppKernel extends Kernel
+{
+    public function registerBundles(): iterable
+    {
+        return [
+            new FrameworkBundle(),
+        ];
+    }
+
+    public function getProjectDir(): string
+    {
+        return __DIR__.'/test';
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+
+    protected function build(ContainerBuilder $container)
+    {
+    }
+}

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -1759,7 +1759,7 @@ protected function createContainerFromFile($file, $data = [], $resetCompilerPass
             $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         }
         $container->getCompilerPassConfig()->setBeforeOptimizationPasses([new LoggerPass()]);
-        $container->getCompilerPassConfig()->setBeforeRemovingPasses([new AddConstraintValidatorsPass(), new TranslatorPass('translator.default', 'translation.reader')]);
+        $container->getCompilerPassConfig()->setBeforeRemovingPasses([new AddConstraintValidatorsPass(), new TranslatorPass()]);
         $container->getCompilerPassConfig()->setAfterRemovingPasses([new AddAnnotationsCachedReaderPass()]);
 
         if (!$compile) {