Merge remote-tracking branch 'cevou/raven'

Author: Seldaek

DependencyInjection/Configuration.php

@@ -120,6 +120,7 @@ public function getConfigTreeBuilder()
                             ->scalarNode('timeout')->end() // socket_handler
                             ->scalarNode('connection_timeout')->end() // socket_handler
                             ->booleanNode('persistent')->end() // socket_handler
+                            ->scalarNode('dsn')->end() // raven_handler
                             ->arrayNode('channels')
                                 ->fixXmlConfig('channel', 'elements')
                                 ->canBeUnset()
@@ -204,6 +205,10 @@ public function getConfigTreeBuilder()
                             ->ifTrue(function($v) { return 'pushover' === $v['type'] && (empty($v['token']) || empty($v['user'])); })
                             ->thenInvalid('The token and user have to be specified to use a PushoverHandler')
                         ->end()
+                        ->validate()
+                            ->ifTrue(function($v) { return 'raven' === $v['type'] && !isset($v['dsn']); })
+                            ->thenInvalid('The DSN has to be specified to use a RavenHandler')
+                        ->end()
                     ->end()
                     ->validate()
                         ->ifTrue(function($v) { return isset($v['debug']); })

DependencyInjection/MonologExtension.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
 /**
  * MonologExtension is an extension for the Monolog library.
@@ -294,6 +295,22 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
             ));
             break;
 
+        case 'raven':
+            $clientId = 'monolog.raven.client.' . sha1($handler['dsn']);
+            if (!$container->hasDefinition($clientId)) {
+                $client = new Definition("Raven_Client", array(
+                    $handler['dsn']
+                ));
+                $client->setPublic(false);
+                $container->setDefinition($clientId, $client);
+            }
+            $definition->setArguments(array(
+                new Reference($clientId),
+                $handler['level'],
+                $handler['bubble'],
+            ));
+            break;
+
         // Handlers using the constructor of AbstractHandler without adding their own arguments
         case 'test':
         case 'null':

Resources/config/monolog.xml

@@ -22,6 +22,7 @@
         <parameter key="monolog.handler.native_mailer.class">Monolog\Handler\NativeMailerHandler</parameter>
         <parameter key="monolog.handler.socket.class">Monolog\Handler\SocketHandler</parameter>
         <parameter key="monolog.handler.pushover.class">Monolog\Handler\PushoverHandler</parameter>
+        <parameter key="monolog.handler.raven.class">Monolog\Handler\RavenHandler</parameter>
 
         <parameter key="monolog.handler.fingers_crossed.class">Monolog\Handler\FingersCrossedHandler</parameter>
         <parameter key="monolog.handler.fingers_crossed.error_level_activation_strategy.class">Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy</parameter>

Tests/DependencyInjection/MonologExtensionTest.php

@@ -169,6 +169,30 @@ public function testSocketHandler()
 
     }
 
+    public function testRavenHandler()
+    {
+        $dsn = 'http://43f6017361224d098402974103bfc53d:[email protected]:9000/1';
+
+        try {
+            $this->getContainer(array(array('handlers' => array('raven' => array('type' => 'raven')))));
+            $this->fail();
+        } catch (InvalidConfigurationException $e) {
+            $this->assertContains('DSN', $e->getMessage());
+        }
+
+        $container = $this->getContainer(array(array('handlers' => array('raven' => array(
+            'type' => 'raven', 'dsn' => $dsn )
+        ))));
+        $this->assertTrue($container->hasDefinition('monolog.logger'));
+        $this->assertTrue($container->hasDefinition('monolog.handler.raven'));
+
+        $logger = $container->getDefinition('monolog.logger');
+        $this->assertDICDefinitionMethodCallAt(0, $logger, 'pushHandler', array(new Reference('monolog.handler.raven')));
+
+        $handler = $container->getDefinition('monolog.handler.raven');
+        $this->assertDICDefinitionClass($handler, '%monolog.handler.raven.class%');
+    }
+
     protected function getContainer(array $config = array())
     {
         $container = new ContainerBuilder();