Merge remote-tracking branch 'origin/master'

Nightbr · Nightbr · commit eb621b84003d · 2017-06-26T16:55:50.000+02:00
diff --git a/src/DependencyInjection/MailjetExtension.php b/src/DependencyInjection/MailjetExtension.php
@@ -33,7 +33,7 @@ public function load(array $configs, ContainerBuilder $container)
             } else {
                 $container->setParameter('mailjet.transactionnal.options', array());
             }
-        }else{
+        } else {
             $container->setParameter('mailjet.transactionnal.call', true);
             $container->setParameter('mailjet.transactionnal.options', array());
         }
@@ -47,6 +47,9 @@ public function load(array $configs, ContainerBuilder $container)
         # Contact Properties config
         $container->setParameter('mailjet.contact_metadata', $config['contact_metadata']);
 
+        //set some alias
+        $container->setAlias('mailjet', 'swiftmailer.mailer.transport.mailjet');
+
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');
     }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function load(array $configs, ContainerBuilder $container)`
`33`	`33`	`} else {`
`34`	`34`	`$container->setParameter('mailjet.transactionnal.options', array());`
`35`	`35`	`}`
`36`		`- }else{`
	`36`	`+ } else {`
`37`	`37`	`$container->setParameter('mailjet.transactionnal.call', true);`
`38`	`38`	`$container->setParameter('mailjet.transactionnal.options', array());`
`39`	`39`	`}`
`@@ -47,6 +47,9 @@ public function load(array $configs, ContainerBuilder $container)`
`47`	`47`	`# Contact Properties config`
`48`	`48`	`$container->setParameter('mailjet.contact_metadata', $config['contact_metadata']);`
`49`	`49`
	`50`	`+ //set some alias`
	`51`	`+ $container->setAlias('mailjet', 'swiftmailer.mailer.transport.mailjet');`
	`52`	`+`
`50`	`53`	`$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));`
`51`	`54`	`$loader->load('services.yml');`
`52`	`55`	`}`