Merge branch '5.1' into 5.2

* 5.1:
  [PhpUnitBridge] CS fix
  [Notifier] Only use sprintf instead of sprintf and string concat
  [PhpUnitBridge] Fix PHP 5.5 compatibility
  Add missing param annotation abouts $fileLinkFormat
  [Form] Fixed StringUtil::trim() to trim ZERO WIDTH SPACE (U+200B) and SOFT HYPHEN (U+00AD)
  23412 Stop treating multiline resources as globs

Author: nicolas-grekas

ErrorRenderer/HtmlErrorRenderer.php

@@ -15,6 +15,7 @@
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 
 /**
@@ -42,8 +43,9 @@ class HtmlErrorRenderer implements ErrorRendererInterface
     private static $template = 'views/error.html.php';
 
     /**
-     * @param bool|callable $debug        The debugging mode as a boolean or a callable that should return it
-     * @param bool|callable $outputBuffer The output buffer as a string or a callable that should return it
+     * @param bool|callable                 $debug          The debugging mode as a boolean or a callable that should return it
+     * @param string|FileLinkFormatter|null $fileLinkFormat
+     * @param bool|callable                 $outputBuffer   The output buffer as a string or a callable that should return it
      */
     public function __construct($debug = false, string $charset = null, $fileLinkFormat = null, string $projectDir = null, $outputBuffer = '', LoggerInterface $logger = null)
     {