Merge remote-tracking branch 'origin/2.1' into 2.2

Conflicts:
	composer.json

Author: Seldaek

DependencyInjection/Configuration.php

@@ -113,7 +113,7 @@ public function getConfigTreeBuilder()
                                 ->end()
                                 ->children()
                                     ->scalarNode('id')->isRequired()->end()
-                                    ->scalarNode('factory-method')->defaultNull()->end()
+                                    ->scalarNode('method')->defaultNull()->end()
                                 ->end()
                             ->end()
                             ->scalarNode('connection_string')->end() // socket_handler

Tests/DependencyInjection/ConfigurationTest.php

@@ -186,6 +186,33 @@ public function testMergingInvalidChannels()
         $config = $this->process($configs);
     }
 
+    public function testWithSwiftMailerHandler()
+    {
+        $configs = array(
+            array(
+                'handlers' => array(
+                    'swift' => array(
+                        'type' => 'swift_mailer',
+                        'from_email' => '[email protected]',
+                        'to_email' => '[email protected]',
+                        'subject' => 'Subject',
+                        'email_prototype' => array(
+                            'id' => 'monolog.prototype',
+                            'method' => 'getPrototype'
+                        )
+                    )
+                )
+            )
+        );
+
+        $config = $this->process($configs);
+
+        // Check email_prototype
+        $this->assertCount(2, $config['handlers']['swift']['email_prototype']);
+        $this->assertEquals('monolog.prototype', $config['handlers']['swift']['email_prototype']['id']);
+        $this->assertEquals('getPrototype', $config['handlers']['swift']['email_prototype']['method']);
+    }
+
     public function testWithType()
     {
         $configs = array(