[MonologBundle] Added services for core processors

src/Symfony/Bridge/Monolog/Processor/WebProcessor.php

@@ -0,0 +1,28 @@
+<?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\Bridge\Monolog\Processor;
+
+use Monolog\Processor\WebProcessor as BaseWebProcessor;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * WebProcessor override to read from the HttpFoundation's Request
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class WebProcessor extends BaseWebProcessor
+{
+    public function __construct(RequestInterface $request) 
+    {
+        parent::__construct($request->server->all());
+    }
+}

src/Symfony/Bundle/MonologBundle/DependencyInjection/MonologExtension.php

@@ -239,7 +239,7 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
             $definition->addMethodCall('setFormatter', array(new Reference($handler['formatter'])));
         }
         if (!empty($handler['processors'])) {
-            $this->addProcessors($definition, $handler['processors']);
+            $this->addProcessors($container, $definition, $handler['processors']);
         }
         $container->setDefinition($handlerId, $definition);
 
@@ -251,17 +251,21 @@ private function getHandlerId($name)
         return sprintf('monolog.handler.%s', $name);
     }
 
-    private function addProcessors(Definition $definition, array $processors)
+    private function addProcessors(ContainerBuilder $container, Definition $definition, array $processors)
     {
         foreach (array_reverse($processors) as $processor) {
-            $definition->addMethodCall('pushProcessor', array($this->parseDefinition($processor)));
+            $definition->addMethodCall('pushProcessor', array($this->parseDefinition($processor, $container)));
         }
     }
 
-    private function parseDefinition($definition)
+    private function parseDefinition($definition, ContainerBuilder $container = null)
     {
         if (0 === strpos($definition, '@')) {
-            return new Reference(substr($definition, 1));
+            $definition = substr($definition, 1);
+            if ($container && $service = $container->getDefinition($definition)) {
+                $service->setPublic(true);
+            }
+            return new Reference($definition);
         }
 
         return $definition;

src/Symfony/Bundle/MonologBundle/Resources/config/monolog.xml

@@ -18,15 +18,25 @@
         <parameter key="monolog.handler.debug.class">Symfony\Bridge\Monolog\Handler\DebugHandler</parameter>
         <parameter key="monolog.handler.swift_mailer.class">Monolog\Handler\SwiftMailerHandler</parameter>
         <parameter key="monolog.handler.native_mailer.class">Monolog\Handler\NativeMailerHandler</parameter>
+        <parameter key="monolog.processor.web.class">Symfony\Bridge\Monolog\Processor\WebProcessor</parameter>
+        <parameter key="monolog.processor.introspection.class">Monolog\Processor\IntrospectionProcessor</parameter>
     </parameters>
 
     <services>
         <service id="monolog.logger" parent="monolog.logger_prototype" public="false">
             <argument index="0">app</argument>
         </service>
+
         <service id="logger" alias="monolog.logger" />
+
         <service id="monolog.logger_prototype" class="%monolog.logger.class%" abstract="true">
             <argument /><!-- Channel -->
         </service>
+
+        <service id="monolog.processor.web" class="%monolog.processor.web.class%" scope="request" public="false">
+            <argument type="service" id="request" />
+        </service>
+
+        <service id="monolog.processor.introspection" class="%monolog.processor.introspection.class%" public="false" />
     </services>
 </container>

src/Symfony/Bundle/MonologBundle/Tests/DependencyInjection/MonologExtensionTest.php

@@ -35,6 +35,21 @@ public function testLoadWithDefault()
         $this->assertDICConstructorArguments($handler, array('%kernel.logs_dir%/%kernel.environment%.log', \Monolog\Logger::DEBUG, true));
     }
 
+    public function testLoadWithProcessor()
+    {
+        $container = new ContainerBuilder();
+        $loader = new MonologExtension();
+
+        $loader->load(array(array('handlers' => array('main' => array('type' => 'stream', 'processors' => array('@monolog.processor.web'))))), $container);
+        $this->assertTrue($container->hasDefinition('monolog.handler.main'));
+
+        $handler = $container->getDefinition('monolog.handler.main');
+        $this->assertDICDefinitionMethodCallAt(0, $handler, 'pushProcessor', array(new Reference('monolog.processor.web')));
+
+        $this->assertTrue($container->getDefinition('monolog.processor.web')->isPublic());
+        $this->assertFalse($container->getDefinition('monolog.processor.introspection')->isPublic());
+    }
+
     public function testLoadWithCustomValues()
     {
         $container = new ContainerBuilder();