bug #45289 [FrameworkBundle] Fix log channel of TagAwareAdapter (fancyweb)

nicolas-grekas · nicolas-grekas · commit 1b695a95d24d · 2022-02-04T15:23:53.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [FrameworkBundle] Fix log channel of TagAwareAdapter | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Forgot to add the tag in #40740, therefore the "app" logger is injected instead of the "cache" one. Commits ------- 494ceaf [FrameworkBundle] Fix log channel of TagAwareAdapter
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1962,7 +1962,8 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
                 if (method_exists(TagAwareAdapter::class, 'setLogger')) {
                     $container
                         ->getDefinition($name)
-                        ->addMethodCall('setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
+                        ->addMethodCall('setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
+                        ->addTag('monolog.logger', ['channel' => 'cache']);
                 }
 
                 $pool['name'] = $name;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1520,6 +1520,7 @@ public function testCachePoolServices()
             $this->assertEquals([
                 ['setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]],
             ], $tagAwareDefinition->getMethodCalls());
+            $this->assertSame([['channel' => 'cache']], $tagAwareDefinition->getTag('monolog.logger'));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1962,7 +1962,8 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con`
`1962`	`1962`	`if (method_exists(TagAwareAdapter::class, 'setLogger')) {`
`1963`	`1963`	`$container`
`1964`	`1964`	`->getDefinition($name)`
`1965`		`- ->addMethodCall('setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);`
	`1965`	`+ ->addMethodCall('setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])`
	`1966`	`+ ->addTag('monolog.logger', ['channel' => 'cache']);`
`1966`	`1967`	`}`
`1967`	`1968`
`1968`	`1969`	`$pool['name'] = $name;`
Original file line number	Diff line number	Diff line change
`@@ -1520,6 +1520,7 @@ public function testCachePoolServices()`
`1520`	`1520`	`$this->assertEquals([`
`1521`	`1521`	`['setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]],`
`1522`	`1522`	`], $tagAwareDefinition->getMethodCalls());`
	`1523`	`+ $this->assertSame([['channel' => 'cache']], $tagAwareDefinition->getTag('monolog.logger'));`
`1523`	`1524`	`}`
`1524`	`1525`	`}`
`1525`	`1526`