Merge branch '5.0' into 5.1

nicolas-grekas · nicolas-grekas · commit 25d892ab4927 · 2020-06-09T13:33:28.000+02:00
* 5.0:
  minor #37141 [Messenger] fix forward compatibility with Doctrine DBAL 2.11+ (xabbuh)
  fix forward compatibility with Doctrine DBAL 3
  [WebProfilerBundle] Set NullLogger for functional tests
  [Mailer] Fixed generator bug when creating multiple transports using Transport::fromDsn
  [FrameworkBundle] Fix XSD definition
  Update welcome.html.php
  [travis] add nightly to allowed failures
diff --git a/Tests/Functional/WebProfilerBundleKernel.php b/Tests/Functional/WebProfilerBundleKernel.php
@@ -2,6 +2,7 @@
 
 namespace Symfony\Bundle\WebProfilerBundle\Tests\Functional;
 
+use Psr\Log\NullLogger;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Bundle\TwigBundle\TwigBundle;
@@ -62,6 +63,11 @@ public function getLogDir()
         return sys_get_temp_dir().'/log-'.spl_object_hash($this);
     }
 
+    protected function build(ContainerBuilder $container)
+    {
+        $container->register('logger', NullLogger::class);
+    }
+
     public function homepageController()
     {
         return new Response('<html><head></head><body>Homepage Controller.</body></html>');
