Skip to content

Commit

Permalink
Merge branch '3.4' into 4.4
Browse files Browse the repository at this point in the history
* 3.4:
  fix forward compatibility with Doctrine DBAL 3
  [WebProfilerBundle] Set NullLogger for functional tests
  [travis] add nightly to allowed failures
  • Loading branch information
nicolas-grekas committed Jun 9, 2020
2 parents b926467 + 41db5bc commit e86d3e8
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Tests/Functional/WebProfilerBundleKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -66,6 +67,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>');
Expand Down

0 comments on commit e86d3e8

Please sign in to comment.