merged branch csanquer/master (PR #42)

This PR was squashed before being merged into the master branch (closes #42).

Discussion
----------

fix OutOfBoundsException when using mail or sendmail transport

Hi,

Since the #34 had been merged, an exception occured when using mail or sendmail transport :

```
[Symfony\Component\DependencyInjection\Exception\OutOfBoundsException]
  The index "1" is not in the range [0, 0].
```

This patch fix it.

Commits
-------

01fb626 fix OutOfBoundsException when using mail or sendmail transport

Author: fabpot

DependencyInjection/SwiftmailerExtension.php

@@ -134,11 +134,24 @@ protected function configureMailerTransport($name, array $mailer, ContainerBuild
                 ->addMethodCall('setSourceIp', array('%swiftmailer.mailer.' . $name . '.transport.smtp.source_ip%'))
             ;
             $container->setAlias(sprintf('swiftmailer.mailer.%s.transport', $name), sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport));
-        } elseif (in_array($transport, array('mail', 'sendmail'))) {
+        } elseif ('sendmail' === $transport) {
             $definitionDecorator = new DefinitionDecorator(sprintf('swiftmailer.transport.%s.abstract', $transport));
             $container
                 ->setDefinition(sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport), $definitionDecorator)
-                ->replaceArgument(1, new Reference(sprintf('swiftmailer.mailer.%s.transport.eventdispatcher', $name)))
+                ->setArguments(array(
+                    new Reference('swiftmailer.transport.buffer'),
+                    new Reference(sprintf('swiftmailer.mailer.%s.transport.eventdispatcher', $name)),
+                ))
+            ;
+            $container->setAlias(sprintf('swiftmailer.mailer.%s.transport', $name), sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport));
+        } elseif ('mail' === $transport) {
+            $definitionDecorator = new DefinitionDecorator(sprintf('swiftmailer.transport.%s.abstract', $transport));
+            $container
+                ->setDefinition(sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport), $definitionDecorator)
+                ->setArguments(array(
+                    new Reference('swiftmailer.transport.mailinvoker'),
+                    new Reference(sprintf('swiftmailer.mailer.%s.transport.eventdispatcher', $name)),
+                ))
             ;
             $container->setAlias(sprintf('swiftmailer.mailer.%s.transport', $name), sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport));
         } elseif ('null' === $transport) {

Tests/DependencyInjection/Fixtures/config/php/mail.php

@@ -0,0 +1,4 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'transport'  => "mail",
+));

Tests/DependencyInjection/Fixtures/config/php/sendmail.php

@@ -0,0 +1,4 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'transport'  => "sendmail",
+));

Tests/DependencyInjection/Fixtures/config/xml/mail.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+
+    <swiftmailer:config
+        transport="mail"
+    />
+</container>

Tests/DependencyInjection/Fixtures/config/xml/sendmail.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+
+    <swiftmailer:config
+        transport="sendmail"
+    />
+</container>

Tests/DependencyInjection/Fixtures/config/yml/mail.yml

@@ -0,0 +1,2 @@
+swiftmailer:
+    transport:  mail

Tests/DependencyInjection/Fixtures/config/yml/sendmail.yml

@@ -0,0 +1,2 @@
+swiftmailer:
+    transport:  sendmail

Tests/DependencyInjection/SwiftmailerExtensionTest.php

@@ -41,6 +41,28 @@ public function testDefaultConfig($type)
         $this->assertEquals('swiftmailer.mailer.default.transport.smtp', (string) $container->getAlias('swiftmailer.mailer.default.transport'));
     }
 
+    /**
+     * @dataProvider getConfigTypes
+     */
+    public function testSendmailConfig($type)
+    {
+        $container = $this->loadContainerFromFile('sendmail', $type);
+
+        $this->assertEquals('swiftmailer.mailer.default.transport', (string) $container->getAlias('swiftmailer.transport'));
+        $this->assertEquals('swiftmailer.mailer.default.transport.sendmail', (string) $container->getAlias('swiftmailer.mailer.default.transport'));
+    }
+    
+    /**
+     * @dataProvider getConfigTypes
+     */
+    public function testMailConfig($type)
+    {
+        $container = $this->loadContainerFromFile('mail', $type);
+
+        $this->assertEquals('swiftmailer.mailer.default.transport', (string) $container->getAlias('swiftmailer.transport'));
+        $this->assertEquals('swiftmailer.mailer.default.transport.mail', (string) $container->getAlias('swiftmailer.mailer.default.transport'));
+    }
+    
     /**
      * @dataProvider getConfigTypes
      */