Merge branch '6.4' into 7.0

* 6.4:
  [HttpKernel][MonologBridge][FrameworkBundle] Revisit wiring of debug loggers
  Improve 6.4 UPGRADE guide
  Add before/after examples to 6.3 UPGRADE guide
  [Security] Do not make PasswordUpgraderInterface a generic

Author: nicolas-grekas

ErrorRenderer/HtmlErrorRenderer.php

@@ -16,7 +16,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
-use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
+use Symfony\Component\HttpKernel\Log\DebugLoggerConfigurator;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Dumper\HtmlDumper;
 
@@ -144,7 +144,7 @@ private function renderException(FlattenException $exception, string $debugTempl
             'exceptionMessage' => $exceptionMessage,
             'statusText' => $statusText,
             'statusCode' => $statusCode,
-            'logger' => $this->logger instanceof DebugLoggerInterface ? $this->logger : null,
+            'logger' => DebugLoggerConfigurator::getDebugLogger($this->logger),
             'currentContent' => \is_string($this->outputBuffer) ? $this->outputBuffer : ($this->outputBuffer)(),
         ]);
     }

composer.json

@@ -26,7 +26,8 @@
         "symfony/deprecation-contracts": "^2.5|^3"
     },
     "conflict": {
-        "symfony/deprecation-contracts": "<2.5"
+        "symfony/deprecation-contracts": "<2.5",
+        "symfony/http-kernel": "<6.4"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\ErrorHandler\\": "" },