minor #24385 [FrameworkBundle] Register a NullLogger from test kernels (ogizanagi)

fabpot · fabpot · commit cd91b8f12027 · 2017-09-30T06:45:16.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] Register a NullLogger from test kernels | Q | A | ------------- | --- | Branch? | 3.4  | Bug fix? | no | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | N/A  | License | MIT | Doc PR | N/A Relates to #24300 This will avoid unnecessary output on Travis or when running FrameworkBundle tests locally: - before: https://travis-ci.org/symfony/symfony/jobs/281624658#L3594-L3635 - after: https://travis-ci.org/symfony/symfony/jobs/281643868#L3599-L3617 but also needed for anyone running functional tests on their project and using the default logger, in order to not get garbage output. Do we need to find a more generic solution (like exposing a `framework.default_logger` option so users can set it to false for test)? Or just documenting this? Commits ------- c109dcd [FrameworkBundle] Register a NullLogger from test kernels
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand\Fixture;
 
+use Psr\Log\NullLogger;
 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
@@ -33,4 +35,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.DIRECTORY_SEPARATOR.'config.yml');
     }
+
+    protected function build(ContainerBuilder $container)
+    {
+        $container->register('logger', NullLogger::class);
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\app;
 
+use Psr\Log\NullLogger;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Kernel;
 
@@ -72,6 +74,11 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load($this->rootConfig);
     }
 
+    protected function build(ContainerBuilder $container)
+    {
+        $container->register('logger', NullLogger::class);
+    }
+
     public function serialize()
     {
         return serialize(array($this->varDir, $this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
 
+use Psr\Log\NullLogger;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
@@ -77,6 +78,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes)
 
     protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
     {
+        $c->register('logger', NullLogger::class);
         $c->loadFromExtension('framework', array(
             'secret' => '$ecret',
         ));

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand\Fixture;`
`13`	`13`
	`14`	`+use Psr\Log\NullLogger;`
`14`	`15`	`use Symfony\Bundle\FrameworkBundle\FrameworkBundle;`
`15`	`16`	`use Symfony\Component\Config\Loader\LoaderInterface;`
	`17`	`+use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`18`	`use Symfony\Component\HttpKernel\Kernel;`
`17`	`19`
`18`	`20`	`class TestAppKernel extends Kernel`
`@@ -33,4 +35,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)`
`33`	`35`	`{`
`34`	`36`	`$loader->load(__DIR__.DIRECTORY_SEPARATOR.'config.yml');`
`35`	`37`	`}`
	`38`	`+`
	`39`	`+ protected function build(ContainerBuilder $container)`
	`40`	`+ {`
	`41`	`+ $container->register('logger', NullLogger::class);`
	`42`	`+ }`
`36`	`43`	`}`