Bladeren bron

[SwiftmailerBundle] fixed indentation in XML files

Fabien Potencier 14 jaren geleden
bovenliggende
commit
0ae108d13f

+ 1 - 1
src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php

@@ -95,7 +95,7 @@ class SwiftmailerExtension extends Extension
 
         if ($config['logging']) {
             $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.messagelogger')));
-            $container->findDefinition('data_collector.swiftmailer')->addTag('data_collector', array('template' => 'Swiftmailer:Collector:swiftmailer', 'id' => 'swiftmailer'));
+            $container->findDefinition('swiftmailer.data_collector')->addTag('data_collector', array('template' => 'Swiftmailer:Collector:swiftmailer', 'id' => 'swiftmailer'));
         }
 
         if (isset($config['delivery_address']) && $config['delivery_address']) {

+ 18 - 18
src/Symfony/Bundle/SwiftmailerBundle/Resources/config/smtp.xml

@@ -4,24 +4,24 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-  <parameters>
-    <parameter key="swiftmailer.transport.smtp.class">Swift_Transport_EsmtpTransport</parameter>
-  </parameters>
+    <parameters>
+        <parameter key="swiftmailer.transport.smtp.class">Swift_Transport_EsmtpTransport</parameter>
+    </parameters>
 
-  <services>
-    <service id="swiftmailer.transport.smtp" class="%swiftmailer.transport.smtp.class%" public="false">
-      <argument type="service" id="swiftmailer.transport.buffer" />
-      <argument type="collection">
-        <argument type="service" id="swiftmailer.transport.authhandler" />
-      </argument>
-      <argument type="service" id="swiftmailer.transport.eventdispatcher" />
+    <services>
+        <service id="swiftmailer.transport.smtp" class="%swiftmailer.transport.smtp.class%" public="false">
+            <argument type="service" id="swiftmailer.transport.buffer" />
+            <argument type="collection">
+                <argument type="service" id="swiftmailer.transport.authhandler" />
+            </argument>
+            <argument type="service" id="swiftmailer.transport.eventdispatcher" />
 
-      <call method="setHost"><argument>%swiftmailer.transport.smtp.host%</argument></call>
-      <call method="setPort"><argument>%swiftmailer.transport.smtp.port%</argument></call>
-      <call method="setEncryption"><argument>%swiftmailer.transport.smtp.encryption%</argument></call>
-      <call method="setUsername"><argument>%swiftmailer.transport.smtp.username%</argument></call>
-      <call method="setPassword"><argument>%swiftmailer.transport.smtp.password%</argument></call>
-      <call method="setAuthMode"><argument>%swiftmailer.transport.smtp.auth_mode%</argument></call>
-    </service>
-  </services>
+            <call method="setHost"><argument>%swiftmailer.transport.smtp.host%</argument></call>
+            <call method="setPort"><argument>%swiftmailer.transport.smtp.port%</argument></call>
+            <call method="setEncryption"><argument>%swiftmailer.transport.smtp.encryption%</argument></call>
+            <call method="setUsername"><argument>%swiftmailer.transport.smtp.username%</argument></call>
+            <call method="setPassword"><argument>%swiftmailer.transport.smtp.password%</argument></call>
+            <call method="setAuthMode"><argument>%swiftmailer.transport.smtp.auth_mode%</argument></call>
+        </service>
+    </services>
 </container>

+ 15 - 15
src/Symfony/Bundle/SwiftmailerBundle/Resources/config/spool.xml

@@ -4,23 +4,23 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-  <parameters>
-    <parameter key="swiftmailer.spool.file.class">Swift_FileSpool</parameter>
+    <parameters>
+        <parameter key="swiftmailer.spool.file.class">Swift_FileSpool</parameter>
 
-    <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>
-    <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>
-  </parameters>
+        <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>
+        <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>
+    </parameters>
 
-  <services>
-    <service id="swiftmailer.transport.spool" class="Swift_Transport_SpoolTransport" public="false">
-      <argument type="service" id="swiftmailer.transport.eventdispatcher" />
-      <argument type="service" id="swiftmailer.spool" />
-    </service>
+    <services>
+        <service id="swiftmailer.transport.spool" class="Swift_Transport_SpoolTransport" public="false">
+            <argument type="service" id="swiftmailer.transport.eventdispatcher" />
+            <argument type="service" id="swiftmailer.spool" />
+        </service>
 
-    <service id="swiftmailer.spool.file" class="%swiftmailer.spool.file.class%" public="false">
-      <argument>%swiftmailer.spool.file.path%</argument>
-    </service>
+        <service id="swiftmailer.spool.file" class="%swiftmailer.spool.file.class%" public="false">
+            <argument>%swiftmailer.spool.file.path%</argument>
+        </service>
 
-    <service id="swiftmailer.spool" alias="swiftmailer.spool.file" public="false" />
-  </services>
+        <service id="swiftmailer.spool" alias="swiftmailer.spool.file" public="false" />
+    </services>
 </container>

+ 51 - 51
src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml

@@ -4,74 +4,74 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-  <parameters>
-    <parameter key="swiftmailer.class">Swift_Mailer</parameter>
+    <parameters>
+        <parameter key="swiftmailer.class">Swift_Mailer</parameter>
 
-    <parameter key="swiftmailer.transport.sendmail.class">Swift_Transport_SendmailTransport</parameter>
-    <parameter key="swiftmailer.transport.mail.class">Swift_Transport_MailTransport</parameter>
+        <parameter key="swiftmailer.transport.sendmail.class">Swift_Transport_SendmailTransport</parameter>
+        <parameter key="swiftmailer.transport.mail.class">Swift_Transport_MailTransport</parameter>
 
-    <parameter key="swiftmailer.transport.failover.class">Swift_Transport_FailoverTransport</parameter>
+        <parameter key="swiftmailer.transport.failover.class">Swift_Transport_FailoverTransport</parameter>
 
-    <parameter key="swiftmailer.init_file">%swiftmailer.base_dir%/swift_init.php</parameter>
+        <parameter key="swiftmailer.init_file">%swiftmailer.base_dir%/swift_init.php</parameter>
 
-    <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>
-    <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>
-    <parameter key="swiftmailer.plugin.messagelogger.class">Symfony\Bundle\SwiftmailerBundle\Logger\MessageLogger</parameter>
-    <parameter key="swiftmailer.data_collector.class">Symfony\Bundle\SwiftmailerBundle\DataCollector\MessageDataCollector</parameter>
-  </parameters>
+        <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>
+        <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>
+        <parameter key="swiftmailer.plugin.messagelogger.class">Symfony\Bundle\SwiftmailerBundle\Logger\MessageLogger</parameter>
+        <parameter key="swiftmailer.data_collector.class">Symfony\Bundle\SwiftmailerBundle\DataCollector\MessageDataCollector</parameter>
+    </parameters>
 
-  <services>
-    <service id="swiftmailer.mailer" class="%swiftmailer.class%" public="false">
-      <argument type="service" id="swiftmailer.transport" />
-    </service>
+    <services>
+        <service id="swiftmailer.mailer" class="%swiftmailer.class%" public="false">
+            <argument type="service" id="swiftmailer.transport" />
+        </service>
 
-    <service id="swiftmailer.transport.sendmail" class="%swiftmailer.transport.sendmail.class%" public="false">
-      <argument type="service" id="swiftmailer.transport.buffer" />
-      <argument type="service" id="swiftmailer.transport.eventdispatcher" />
-    </service>
+        <service id="swiftmailer.transport.sendmail" class="%swiftmailer.transport.sendmail.class%" public="false">
+            <argument type="service" id="swiftmailer.transport.buffer" />
+            <argument type="service" id="swiftmailer.transport.eventdispatcher" />
+        </service>
 
-    <service id="swiftmailer.transport.mail" class="%swiftmailer.transport.mail.class%" public="false">
-      <argument type="service" id="swiftmailer.transport.mailinvoker" />
-      <argument type="service" id="swiftmailer.transport.eventdispatcher" />
-    </service>
+        <service id="swiftmailer.transport.mail" class="%swiftmailer.transport.mail.class%" public="false">
+            <argument type="service" id="swiftmailer.transport.mailinvoker" />
+            <argument type="service" id="swiftmailer.transport.eventdispatcher" />
+        </service>
 
-    <service id="swiftmailer.transport.failover" class="%swiftmailer.transport.failover.class%" public="false" />
+        <service id="swiftmailer.transport.failover" class="%swiftmailer.transport.failover.class%" public="false" />
 
-    <service id="swiftmailer.transport.mailinvoker" class="Swift_Transport_SimpleMailInvoker" public="false" />
+        <service id="swiftmailer.transport.mailinvoker" class="Swift_Transport_SimpleMailInvoker" public="false" />
 
-    <service id="swiftmailer.transport.buffer" class="Swift_Transport_StreamBuffer" public="false">
-      <argument type="service" id="swiftmailer.transport.replacementfactory" />
-    </service>
+        <service id="swiftmailer.transport.buffer" class="Swift_Transport_StreamBuffer" public="false">
+            <argument type="service" id="swiftmailer.transport.replacementfactory" />
+        </service>
 
-    <service id="swiftmailer.transport.authhandler" class="Swift_Transport_Esmtp_AuthHandler" public="false">
-      <argument type="collection">
-        <argument type="service"><service class="Swift_Transport_Esmtp_Auth_CramMd5Authenticator" public="false" /></argument>
-        <argument type="service"><service class="Swift_Transport_Esmtp_Auth_LoginAuthenticator" public="false" /></argument>
-        <argument type="service"><service class="Swift_Transport_Esmtp_Auth_PlainAuthenticator" public="false" /></argument>
-      </argument>
-    </service>
+        <service id="swiftmailer.transport.authhandler" class="Swift_Transport_Esmtp_AuthHandler" public="false">
+            <argument type="collection">
+                <argument type="service"><service class="Swift_Transport_Esmtp_Auth_CramMd5Authenticator" public="false" /></argument>
+                <argument type="service"><service class="Swift_Transport_Esmtp_Auth_LoginAuthenticator" public="false" /></argument>
+                <argument type="service"><service class="Swift_Transport_Esmtp_Auth_PlainAuthenticator" public="false" /></argument>
+            </argument>
+        </service>
 
-    <service id="swiftmailer.transport.eventdispatcher" class="Swift_Events_SimpleEventDispatcher" public="false" />
+        <service id="swiftmailer.transport.eventdispatcher" class="Swift_Events_SimpleEventDispatcher" public="false" />
 
-    <service id="swiftmailer.transport.replacementfactory" class="Swift_StreamFilters_StringReplacementFilterFactory" public="false" />
+        <service id="swiftmailer.transport.replacementfactory" class="Swift_StreamFilters_StringReplacementFilterFactory" public="false" />
 
-    <service id="swiftmailer.transport.null" class="Swift_Transport_NullTransport" public="false">
-      <argument type="service" id="swiftmailer.transport.eventdispatcher" />
-    </service>
+        <service id="swiftmailer.transport.null" class="Swift_Transport_NullTransport" public="false">
+            <argument type="service" id="swiftmailer.transport.eventdispatcher" />
+        </service>
 
-    <service id="swiftmailer.plugin.redirecting" class="%swiftmailer.plugin.redirecting.class%" public="false">
-      <argument>%swiftmailer.single_address%</argument>
-    </service>
+        <service id="swiftmailer.plugin.redirecting" class="%swiftmailer.plugin.redirecting.class%" public="false">
+            <argument>%swiftmailer.single_address%</argument>
+        </service>
 
-    <service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" />
+        <service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" />
 
-    <service id="swiftmailer.plugin.messagelogger" class="%swiftmailer.plugin.messagelogger.class%" public="false" />
+        <service id="swiftmailer.plugin.messagelogger" class="%swiftmailer.plugin.messagelogger.class%" public="false" />
 
-    <service id="data_collector.swiftmailer" class="%swiftmailer.data_collector.class%" public="false">
-        <argument type="service" id="swiftmailer.plugin.messagelogger" />
-        <argument type="service" id="swiftmailer.mailer" />
-    </service>
+        <service id="swiftmailer.data_collector" class="%swiftmailer.data_collector.class%" public="false">
+            <argument type="service" id="swiftmailer.plugin.messagelogger" />
+            <argument type="service" id="swiftmailer.mailer" />
+        </service>
 
-    <service id="swiftmailer.transport" alias="swiftmailer.transport.smtp" public="false" />
-  </services>
+        <service id="swiftmailer.transport" alias="swiftmailer.transport.smtp" public="false" />
+    </services>
 </container>