Changeset 32422
- Timestamp:
- 03/30/11 21:00:09 (2 years ago)
- Files:
-
- branches/2.0/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php (modified) (2 diffs)
- branches/2.0/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/smtp.xml (modified) (1 diff)
- branches/2.0/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/spool.xml (modified) (1 diff)
- branches/2.0/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/2.0/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
r32421 r32422 47 47 48 48 $r = new \ReflectionClass('Swift_Message'); 49 $container->getDefinition('swiftmailer.mailer')->setFile(dirname(dirname(dirname($r->getFilename()))) );49 $container->getDefinition('swiftmailer.mailer')->setFile(dirname(dirname(dirname($r->getFilename()))).'/swift_init.php'); 50 50 51 51 $configuration = new Configuration(); … … 96 96 if ($config['logging']) { 97 97 $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.messagelogger'))); 98 $container->findDefinition(' data_collector.swiftmailer')->addTag('data_collector', array('template' => 'Swiftmailer:Collector:swiftmailer', 'id' => 'swiftmailer'));98 $container->findDefinition('swiftmailer.data_collector')->addTag('data_collector', array('template' => 'Swiftmailer:Collector:swiftmailer', 'id' => 'swiftmailer')); 99 99 } 100 100 branches/2.0/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/smtp.xml
r32184 r32422 5 5 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> 6 6 7 <parameters>8 <parameter key="swiftmailer.transport.smtp.class">Swift_Transport_EsmtpTransport</parameter>9 </parameters>7 <parameters> 8 <parameter key="swiftmailer.transport.smtp.class">Swift_Transport_EsmtpTransport</parameter> 9 </parameters> 10 10 11 <services>12 <service id="swiftmailer.transport.smtp" class="%swiftmailer.transport.smtp.class%" public="false">13 <argument type="service" id="swiftmailer.transport.buffer" />14 <argument type="collection">15 <argument type="service" id="swiftmailer.transport.authhandler" />16 </argument>17 <argument type="service" id="swiftmailer.transport.eventdispatcher" />11 <services> 12 <service id="swiftmailer.transport.smtp" class="%swiftmailer.transport.smtp.class%" public="false"> 13 <argument type="service" id="swiftmailer.transport.buffer" /> 14 <argument type="collection"> 15 <argument type="service" id="swiftmailer.transport.authhandler" /> 16 </argument> 17 <argument type="service" id="swiftmailer.transport.eventdispatcher" /> 18 18 19 <call method="setHost"><argument>%swiftmailer.transport.smtp.host%</argument></call>20 <call method="setPort"><argument>%swiftmailer.transport.smtp.port%</argument></call>21 <call method="setEncryption"><argument>%swiftmailer.transport.smtp.encryption%</argument></call>22 <call method="setUsername"><argument>%swiftmailer.transport.smtp.username%</argument></call>23 <call method="setPassword"><argument>%swiftmailer.transport.smtp.password%</argument></call>24 <call method="setAuthMode"><argument>%swiftmailer.transport.smtp.auth_mode%</argument></call>25 </service>26 </services>19 <call method="setHost"><argument>%swiftmailer.transport.smtp.host%</argument></call> 20 <call method="setPort"><argument>%swiftmailer.transport.smtp.port%</argument></call> 21 <call method="setEncryption"><argument>%swiftmailer.transport.smtp.encryption%</argument></call> 22 <call method="setUsername"><argument>%swiftmailer.transport.smtp.username%</argument></call> 23 <call method="setPassword"><argument>%swiftmailer.transport.smtp.password%</argument></call> 24 <call method="setAuthMode"><argument>%swiftmailer.transport.smtp.auth_mode%</argument></call> 25 </service> 26 </services> 27 27 </container> branches/2.0/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/spool.xml
r32184 r32422 5 5 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> 6 6 7 <parameters>8 <parameter key="swiftmailer.spool.file.class">Swift_FileSpool</parameter>7 <parameters> 8 <parameter key="swiftmailer.spool.file.class">Swift_FileSpool</parameter> 9 9 10 <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter>11 <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter>12 </parameters>10 <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter> 11 <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter> 12 </parameters> 13 13 14 <services>15 <service id="swiftmailer.transport.spool" class="Swift_Transport_SpoolTransport" public="false">16 <argument type="service" id="swiftmailer.transport.eventdispatcher" />17 <argument type="service" id="swiftmailer.spool" />18 </service>14 <services> 15 <service id="swiftmailer.transport.spool" class="Swift_Transport_SpoolTransport" public="false"> 16 <argument type="service" id="swiftmailer.transport.eventdispatcher" /> 17 <argument type="service" id="swiftmailer.spool" /> 18 </service> 19 19 20 <service id="swiftmailer.spool.file" class="%swiftmailer.spool.file.class%" public="false">21 <argument>%swiftmailer.spool.file.path%</argument>22 </service>20 <service id="swiftmailer.spool.file" class="%swiftmailer.spool.file.class%" public="false"> 21 <argument>%swiftmailer.spool.file.path%</argument> 22 </service> 23 23 24 <service id="swiftmailer.spool" alias="swiftmailer.spool.file" public="false" />25 </services>24 <service id="swiftmailer.spool" alias="swiftmailer.spool.file" public="false" /> 25 </services> 26 26 </container> branches/2.0/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
r32421 r32422 5 5 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> 6 6 7 <parameters>8 <parameter key="swiftmailer.class">Swift_Mailer</parameter>7 <parameters> 8 <parameter key="swiftmailer.class">Swift_Mailer</parameter> 9 9 10 <parameter key="swiftmailer.transport.sendmail.class">Swift_Transport_SendmailTransport</parameter>11 <parameter key="swiftmailer.transport.mail.class">Swift_Transport_MailTransport</parameter>10 <parameter key="swiftmailer.transport.sendmail.class">Swift_Transport_SendmailTransport</parameter> 11 <parameter key="swiftmailer.transport.mail.class">Swift_Transport_MailTransport</parameter> 12 12 13 <parameter key="swiftmailer.transport.failover.class">Swift_Transport_FailoverTransport</parameter>13 <parameter key="swiftmailer.transport.failover.class">Swift_Transport_FailoverTransport</parameter> 14 14 15 <parameter key="swiftmailer.init_file">%swiftmailer.base_dir%/swift_init.php</parameter> 15 <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter> 16 <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter> 17 <parameter key="swiftmailer.plugin.messagelogger.class">Symfony\Bundle\SwiftmailerBundle\Logger\MessageLogger</parameter> 18 <parameter key="swiftmailer.data_collector.class">Symfony\Bundle\SwiftmailerBundle\DataCollector\MessageDataCollector</parameter> 19 </parameters> 16 20 17 <parameter key="swiftmailer.plugin.redirecting.class">Swift_Plugins_RedirectingPlugin</parameter> 18 <parameter key="swiftmailer.plugin.blackhole.class">Swift_Plugins_BlackholePlugin</parameter> 19 <parameter key="swiftmailer.plugin.messagelogger.class">Symfony\Bundle\SwiftmailerBundle\Logger\MessageLogger</parameter> 20 <parameter key="swiftmailer.data_collector.class">Symfony\Bundle\SwiftmailerBundle\DataCollector\MessageDataCollector</parameter> 21 </parameters> 21 <services> 22 <service id="swiftmailer.mailer" class="%swiftmailer.class%" public="false"> 23 <argument type="service" id="swiftmailer.transport" /> 24 </service> 22 25 23 <services>24 <service id="swiftmailer.mailer" class="%swiftmailer.class%" public="false">25 <argument type="service" id="swiftmailer.transport" />26 </service>26 <service id="swiftmailer.transport.sendmail" class="%swiftmailer.transport.sendmail.class%" public="false"> 27 <argument type="service" id="swiftmailer.transport.buffer" /> 28 <argument type="service" id="swiftmailer.transport.eventdispatcher" /> 29 </service> 27 30 28 <service id="swiftmailer.transport.sendmail" class="%swiftmailer.transport.sendmail.class%" public="false">29 <argument type="service" id="swiftmailer.transport.buffer" />30 <argument type="service" id="swiftmailer.transport.eventdispatcher" />31 </service>31 <service id="swiftmailer.transport.mail" class="%swiftmailer.transport.mail.class%" public="false"> 32 <argument type="service" id="swiftmailer.transport.mailinvoker" /> 33 <argument type="service" id="swiftmailer.transport.eventdispatcher" /> 34 </service> 32 35 33 <service id="swiftmailer.transport.mail" class="%swiftmailer.transport.mail.class%" public="false"> 34 <argument type="service" id="swiftmailer.transport.mailinvoker" /> 35 <argument type="service" id="swiftmailer.transport.eventdispatcher" /> 36 </service> 36 <service id="swiftmailer.transport.failover" class="%swiftmailer.transport.failover.class%" public="false" /> 37 37 38 <service id="swiftmailer.transport.failover" class="%swiftmailer.transport.failover.class%" public="false" />38 <service id="swiftmailer.transport.mailinvoker" class="Swift_Transport_SimpleMailInvoker" public="false" /> 39 39 40 <service id="swiftmailer.transport.mailinvoker" class="Swift_Transport_SimpleMailInvoker" public="false" /> 40 <service id="swiftmailer.transport.buffer" class="Swift_Transport_StreamBuffer" public="false"> 41 <argument type="service" id="swiftmailer.transport.replacementfactory" /> 42 </service> 41 43 42 <service id="swiftmailer.transport.buffer" class="Swift_Transport_StreamBuffer" public="false"> 43 <argument type="service" id="swiftmailer.transport.replacementfactory" /> 44 </service> 44 <service id="swiftmailer.transport.authhandler" class="Swift_Transport_Esmtp_AuthHandler" public="false"> 45 <argument type="collection"> 46 <argument type="service"><service class="Swift_Transport_Esmtp_Auth_CramMd5Authenticator" public="false" /></argument> 47 <argument type="service"><service class="Swift_Transport_Esmtp_Auth_LoginAuthenticator" public="false" /></argument> 48 <argument type="service"><service class="Swift_Transport_Esmtp_Auth_PlainAuthenticator" public="false" /></argument> 49 </argument> 50 </service> 45 51 46 <service id="swiftmailer.transport.authhandler" class="Swift_Transport_Esmtp_AuthHandler" public="false"> 47 <argument type="collection"> 48 <argument type="service"><service class="Swift_Transport_Esmtp_Auth_CramMd5Authenticator" public="false" /></argument> 49 <argument type="service"><service class="Swift_Transport_Esmtp_Auth_LoginAuthenticator" public="false" /></argument> 50 <argument type="service"><service class="Swift_Transport_Esmtp_Auth_PlainAuthenticator" public="false" /></argument> 51 </argument> 52 </service> 52 <service id="swiftmailer.transport.eventdispatcher" class="Swift_Events_SimpleEventDispatcher" public="false" /> 53 53 54 <service id="swiftmailer.transport.eventdispatcher" class="Swift_Events_SimpleEventDispatcher" public="false" />54 <service id="swiftmailer.transport.replacementfactory" class="Swift_StreamFilters_StringReplacementFilterFactory" public="false" /> 55 55 56 <service id="swiftmailer.transport.replacementfactory" class="Swift_StreamFilters_StringReplacementFilterFactory" public="false" /> 56 <service id="swiftmailer.transport.null" class="Swift_Transport_NullTransport" public="false"> 57 <argument type="service" id="swiftmailer.transport.eventdispatcher" /> 58 </service> 57 59 58 <service id="swiftmailer.transport.null" class="Swift_Transport_NullTransport" public="false">59 <argument type="service" id="swiftmailer.transport.eventdispatcher" />60 </service>60 <service id="swiftmailer.plugin.redirecting" class="%swiftmailer.plugin.redirecting.class%" public="false"> 61 <argument>%swiftmailer.single_address%</argument> 62 </service> 61 63 62 <service id="swiftmailer.plugin.redirecting" class="%swiftmailer.plugin.redirecting.class%" public="false"> 63 <argument>%swiftmailer.single_address%</argument> 64 </service> 64 <service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" /> 65 65 66 <service id="swiftmailer.plugin.blackhole" class="%swiftmailer.plugin.blackhole.class%" public="false" />66 <service id="swiftmailer.plugin.messagelogger" class="%swiftmailer.plugin.messagelogger.class%" public="false" /> 67 67 68 <service id="swiftmailer.plugin.messagelogger" class="%swiftmailer.plugin.messagelogger.class%" public="false" /> 68 <service id="swiftmailer.data_collector" class="%swiftmailer.data_collector.class%" public="false"> 69 <argument type="service" id="swiftmailer.plugin.messagelogger" /> 70 <argument type="service" id="swiftmailer.mailer" /> 71 </service> 69 72 70 <service id="data_collector.swiftmailer" class="%swiftmailer.data_collector.class%" public="false"> 71 <argument type="service" id="swiftmailer.plugin.messagelogger" /> 72 <argument type="service" id="swiftmailer.mailer" /> 73 </service> 74 75 <service id="swiftmailer.transport" alias="swiftmailer.transport.smtp" public="false" /> 76 </services> 73 <service id="swiftmailer.transport" alias="swiftmailer.transport.smtp" public="false" /> 74 </services> 77 75 </container>
