bug #183 Fix service handler usage (avant1)

This PR was squashed before being merged into the 3.x-dev branch (closes #183).

Discussion
----------

Fix service handler usage

This should fix #181.

Commits
-------

2833e61 Fix service handler usage

Author: fabpot

DependencyInjection/MonologExtension.php

@@ -129,6 +129,12 @@ public function getNamespace()
     private function buildHandler(ContainerBuilder $container, $name, array $handler)
     {
         $handlerId = $this->getHandlerId($name);
+        if ('service' === $handler['type']) {
+            $container->setAlias($handlerId, $handler['id']);
+
+            return $handlerId;
+        }
+
         $definition = new Definition($this->getHandlerClassByType($handler['type']));
 
         $handler['level'] = $this->levelToMonologConst($handler['level']);
@@ -138,11 +144,6 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
         }
 
         switch ($handler['type']) {
-        case 'service':
-            $container->setAlias($handlerId, $handler['id']);
-
-            return $handlerId;
-
         case 'stream':
             $definition->setArguments(array(
                 $handler['path'],

Tests/DependencyInjection/MonologExtensionTest.php

@@ -14,6 +14,7 @@
 use Symfony\Bundle\MonologBundle\DependencyInjection\MonologExtension;
 use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
@@ -72,6 +73,21 @@ public function testLoadWithNestedHandler()
         $this->assertDICConstructorArguments($handler, array('/tmp/symfony.log', \Monolog\Logger::ERROR, false, 0666));
     }
 
+    public function testLoadWithServiceHandler()
+    {
+        $container = $this->getContainer(
+            array(array('handlers' => array('custom' => array('type' => 'service', 'id' => 'some.service.id')))),
+            array('some.service.id' => new Definition('stdClass', array('foo', false)))
+        );
+
+        $this->assertTrue($container->hasDefinition('monolog.logger'));
+        $this->assertTrue($container->hasAlias('monolog.handler.custom'));
+
+        $handler = $container->findDefinition('monolog.handler.custom');
+        $this->assertDICDefinitionClass($handler, 'stdClass');
+        $this->assertDICConstructorArguments($handler, array('foo', false));
+    }
+
     /**
      * @expectedException InvalidArgumentException
      */
@@ -365,9 +381,13 @@ public function testFingersCrossedHandlerWhenExcluded404sAreSpecified()
         $this->assertDICConstructorArguments($handler, array(new Reference('monolog.handler.nested'), new Reference('monolog.handler.main.not_found_strategy'), 0, true, true, null));
     }
 
-    protected function getContainer(array $config = array())
+    protected function getContainer(array $config = array(), array $thirdPartyDefinitions = array())
     {
         $container = new ContainerBuilder();
+        foreach ($thirdPartyDefinitions as $id => $definition) {
+            $container->setDefinition($id, $definition);
+        }
+
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
         $container->addCompilerPass(new LoggerChannelPass());