merged branch stof/fix_monolog_processor (PR #3418)

Commits
-------

d02ca25 [MonologBundle] Fixed a bug when adding a processor on a service handler

Discussion
----------

Fix monolog processor

This is the proper bugfix replacing #3417, and adding a test for it

src/Symfony/Bundle/MonologBundle/DependencyInjection/Compiler/AddProcessorsPass.php

@@ -35,7 +35,7 @@ class AddProcessorsPass implements CompilerPassInterface
                 }
 
                 if (!empty($tag['handler'])) {
-                    $definition = $container->getDefinition(sprintf('monolog.handler.%s', $tag['handler']));
+                    $definition = $container->findDefinition(sprintf('monolog.handler.%s', $tag['handler']));
                 } elseif (!empty($tag['channel'])) {
                     if ('app' === $tag['channel']) {
                         $definition = $container->getDefinition('monolog.logger');

src/Symfony/Bundle/MonologBundle/Tests/DependencyInjection/Compiler/AddProcessorsPassTest.php

@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\MonologBundle\Tests\DependencyInjection\Compiler;
+
+use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\AddProcessorsPass;
+use Symfony\Bundle\MonologBundle\Tests\TestCase;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+
+class AddProcessorsPassTest extends TestCase
+{
+    public function testHandlerProcessors()
+    {
+        $container = $this->getContainer();
+
+        $service = $container->getDefinition('monolog.handler.test');
+        $calls = $service->getMethodCalls();
+        $this->assertCount(1, $calls);
+        $this->assertEquals(array('pushProcessor', array(new Reference('test'))), $calls[0]);
+
+        $service = $container->getDefinition('handler_test');
+        $calls = $service->getMethodCalls();
+        $this->assertCount(1, $calls);
+        $this->assertEquals(array('pushProcessor', array(new Reference('test2'))), $calls[0]);
+    }
+
+    protected function getContainer()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
+        $loader->load('monolog.xml');
+
+        $definition = $container->getDefinition('monolog.logger_prototype');
+        $container->setDefinition('monolog.handler.test', new Definition('%monolog.handler.null.class%', array (100, false)));
+        $container->setDefinition('handler_test', new Definition('%monolog.handler.null.class%', array (100, false)));
+        $container->setAlias('monolog.handler.test2', 'handler_test');
+        $definition->addMethodCall('pushHandler', array(new Reference('monolog.handler.test')));
+        $definition->addMethodCall('pushHandler', array(new Reference('monolog.handler.test2')));
+
+        $service = new Definition('TestClass', array('false', new Reference('logger')));
+        $service->addTag('monolog.processor', array ('handler' => 'test'));
+        $container->setDefinition('test', $service);
+
+        $service = new Definition('TestClass', array('false', new Reference('logger')));
+        $service->addTag('monolog.processor', array ('handler' => 'test2'));
+        $container->setDefinition('test2', $service);
+
+        $container->getCompilerPassConfig()->setOptimizationPasses(array());
+        $container->getCompilerPassConfig()->setRemovingPasses(array());
+        $container->addCompilerPass(new AddProcessorsPass());
+        $container->compile();
+
+        return $container;
+    }
+}