gergely/kekrozsak
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgraded to Symfony 2.1-beta2

Browse Source
This commit is contained in:
Polonkai Gergely
2012-07-15 14:56:31 +02:00
parent c1232c9792
commit bb7aee6fee
455 changed files with 21001 additions and 18480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php vendored
View File

@@ -53,6 +53,8 @@ class Configuration implements ConfigurationInterface
->scalarNode('password')->defaultNull()->end()
->scalarNode('host')->defaultValue('localhost')->end()
->scalarNode('port')->defaultFalse()->end()
->scalarNode('timeout')->defaultValue(30)->end()
->scalarNode('source_ip')->defaultNull()->end()
->scalarNode('encryption')
->defaultNull()
->validate()

2
vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php vendored
View File

@@ -76,7 +76,7 @@ class SwiftmailerExtension extends Extension
$config['port'] = 'ssl' === $config['encryption'] ? 465 : 25;
}
foreach (array('encryption', 'port', 'host', 'username', 'password', 'auth_mode') as $key) {
foreach (array('encryption', 'port', 'host', 'username', 'password', 'auth_mode', 'timeout', 'source_ip') as $key) {
$container->setParameter('swiftmailer.transport.smtp.'.$key, $config[$key]);
}

2
vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/Resources/config/schema/swiftmailer-1.0.xsd vendored
View File

@@ -19,6 +19,8 @@
<xsd:attribute name="port" type="xsd:string" />
<xsd:attribute name="encryption" type="encryption" />
<xsd:attribute name="auth-mode" type="auth_mode" />
<xsd:attribute name="timeout" type="xsd:string"/>
<xsd:attribute name="source-ip" type="xsd:string"/>
<xsd:attribute name="transport" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="delivery-address" type="xsd:string" />

2
vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/Resources/config/smtp.xml vendored
View File

@@ -22,6 +22,8 @@
<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>
<call method="setTimeout"><argument>%swiftmailer.transport.smtp.timeout%</argument></call>
<call method="setSourceIp"><argument>%swiftmailer.transport.smtp.source_ip%</argument></call>
</service>
</services>
</container>

11
vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/composer.json vendored
View File

@@ -18,8 +18,13 @@
],
"require": {
"php": ">=5.3.2",
"swiftmailer/swiftmailer": ">=4.1.8,<4.2-dev",
"symfony/swiftmailer-bridge": "self.version"
"swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev",
"symfony/swiftmailer-bridge": "2.1.*"
},
"require-dev": {
"symfony/dependency-injection": "2.1.*",
"symfony/http-kernel": "2.1.*",
"symfony/config": "2.1.*"
},
"autoload": {
"psr-0": { "Symfony\\Bundle\\SwiftmailerBundle": "" }
@@ -27,7 +32,7 @@
"target-dir": "Symfony/Bundle/SwiftmailerBundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
"dev-master": "2.1-dev"
}
}
}

20
vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/phpunit.xml.dist vendored Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit colors="true" bootstrap="vendor/autoload.php">
<testsuites>
<testsuite name="SwiftmailerBundle for the Symfony Framework">
<directory>./Tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>.</directory>
<exclude>
<directory>./Resources</directory>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</whitelist>
</filter>
</phpunit>