merged 2.0
This commit is contained in:
commit
62100f1a18
@ -18,5 +18,5 @@ AnnotationRegistry::registerFile(__DIR__.'/vendor/doctrine/orm/lib/Doctrine/ORM/
|
|||||||
|
|
||||||
if (is_file(__DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php')) {
|
if (is_file(__DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php')) {
|
||||||
require_once __DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php';
|
require_once __DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php';
|
||||||
Swift::registerAutoload(__DIR__.'/vendor/swiftmailer/swiftmailer/lib/swift_init.php');
|
Swift::registerAutoload(function () { require __DIR__.'/vendor/swiftmailer/swiftmailer/lib/swift_init.php'; });
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.3",
|
"php": ">=5.3.3",
|
||||||
"swiftmailer/swiftmailer": ">=4.1.2,<4.3-dev"
|
"swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"symfony/http-kernel": "self.version"
|
"symfony/http-kernel": "self.version"
|
||||||
|
Reference in New Issue
Block a user