Merge pull request #66 from xabbuh/issue-65

configure Swiftmailer handlers transports depending on the current conta...

DependencyInjection/Compiler/AddSwiftMailerTransportPass.php

@@ -0,0 +1,55 @@
+<?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\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Sets the transport for Swiftmailer handlers depending on the existing
+ * container definitions.
+ *
+ * @author Christian Flothmann <christian.flothmann@xabbuh.de>
+ */
+class AddSwiftMailerTransportPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $handlers = $container->getParameter('monolog.swift_mailer.handlers');
+
+        foreach ($handlers as $id) {
+            $definition = $container->getDefinition($id);
+
+            if (
+                $container->hasAlias('swiftmailer.transport.real') ||
+                $container->hasDefinition('swiftmailer.transport.real')
+            ) {
+                $definition->addMethodCall(
+                    'setTransport',
+                    array(new Reference('swiftmailer.transport.real'))
+                );
+            } elseif (
+                $container->hasAlias('swiftmailer.transport') ||
+                $container->hasDefinition('swiftmailer.transport')
+            ) {
+                $definition->addMethodCall(
+                    'setTransport',
+                    array(new Reference('swiftmailer.transport'))
+                );
+            }
+        }
+    }
+}

DependencyInjection/MonologExtension.php

@@ -29,6 +29,8 @@ class MonologExtension extends Extension
 {
     private $nestedHandlers = array();
 
+    private $swiftMailerHandlers = array();
+
     /**
      * Loads the Monolog configuration.
      *
@@ -54,6 +56,11 @@ public function load(array $configs, ContainerBuilder $container)
                 );
             }
 
+            $container->setParameter(
+                'monolog.swift_mailer.handlers',
+                $this->swiftMailerHandlers
+            );
+
             ksort($handlers);
             $sortedHandlers = array();
             foreach ($handlers as $priorityHandlers) {
@@ -315,7 +322,7 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['bubble'],
             ));
             if (!$oldHandler) {
-                $definition->addMethodCall('setTransport', array(new Reference('swiftmailer.transport.real')));
+                $this->swiftMailerHandlers[] = $handlerId;
                 $definition->addTag('kernel.event_listener', array('event' => 'kernel.terminate', 'method' => 'onKernelTerminate'));
             }
             break;

MonologBundle.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\MonologBundle;
 
+use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\AddSwiftMailerTransportPass;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass;
@@ -31,5 +32,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass($channelPass = new LoggerChannelPass());
         $container->addCompilerPass(new DebugHandlerPass($channelPass));
         $container->addCompilerPass(new AddProcessorsPass());
+        $container->addCompilerPass(new AddSwiftMailerTransportPass());
     }
 }

Tests/DependencyInjection/Compiler/AddSwiftMailerTransportPassTest.php

@@ -0,0 +1,82 @@
+<?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\AddSwiftMailerTransportPass;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @author Christian Flothmann <christian.flothmann@xabbuh.de>
+ */
+class AddSwiftMailerTransportPassTest extends \PHPUnit_Framework_TestCase
+{
+    private $compilerPass;
+
+    private $container;
+
+    private $definition;
+
+    protected function setUp()
+    {
+        $this->compilerPass = new AddSwiftMailerTransportPass();
+        $this->definition = $this->getMock('\Symfony\Component\DependencyInjection\Definition');
+        $this->container = $this->getMock('\Symfony\Component\DependencyInjection\ContainerBuilder');
+        $this->container->expects($this->any())
+            ->method('getParameter')
+            ->with('monolog.swift_mailer.handlers')
+            ->will($this->returnValue(array('foo')));
+        $this->container->expects($this->any())
+            ->method('getDefinition')
+            ->with('foo')
+            ->will($this->returnValue($this->definition));
+    }
+
+    public function testWithRealTransport()
+    {
+        $this->container
+            ->expects($this->any())
+            ->method('hasDefinition')
+            ->with('swiftmailer.transport.real')
+            ->will($this->returnValue(true));
+        $this->definition
+            ->expects($this->once())
+            ->method('addMethodCall')
+            ->with(
+                'setTransport',
+                $this->equalTo(array(new Reference('swiftmailer.transport.real')))
+            );
+
+        $this->compilerPass->process($this->container);
+    }
+
+    public function testWithoutRealTransport()
+    {
+        $this->container
+            ->expects($this->any())
+            ->method('hasDefinition')
+            ->will($this->returnValueMap(
+                array(
+                    array('swiftmailer.transport.real', false),
+                    array('swiftmailer.transport', true),
+                )
+            ));
+        $this->definition
+            ->expects($this->once())
+            ->method('addMethodCall')
+            ->with(
+                'setTransport',
+                $this->equalTo(array(new Reference('swiftmailer.transport')))
+            );
+
+        $this->compilerPass->process($this->container);
+    }
+}