Merge pull request #59 from mentalstring/master

update swiftmailer to >=5.2.1

Author: GromNaN

composer.json

@@ -3,7 +3,7 @@
     "description": "Fork of symfony 1.4 with dic, form enhancements, latest swiftmailer and better performance",
     "license": "MIT",
     "require": {
-        "swiftmailer/swiftmailer": ">=4.2.2,<5.1.0-dev"
+        "swiftmailer/swiftmailer": "~5.2.1"
     },
     "type": "library",
     "autoload": {

lib/config/sfFactoryConfigHandler.class.php

@@ -219,8 +219,7 @@ public function execute($configFiles)
           $instances[] = sprintf(
                         "if (!class_exists('Swift')) {\n".
                         "  \$swift_dir = sfConfig::get('sf_swiftmailer_dir', sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib');\n".
-                        "  require_once \$swift_dir.'/classes/Swift.php';\n".
-                        "  Swift::registerAutoload(\$swift_dir.'/swift_init.php');\n".
+                        "  require_once \$swift_dir.'/swift_required.php';\n".
                         "}\n".
                         "\$this->setMailerConfiguration(array_merge(array('class' => sfConfig::get('sf_factory_mailer', '%s')), sfConfig::get('sf_factory_mailer_parameters', %s)));\n"
                         , $class, var_export($parameters, true));

lib/task/sfCommandApplicationTask.class.php

@@ -131,8 +131,7 @@ protected function initializeMailer()
     if (!class_exists('Swift'))
     {
       $swift_dir = sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib';
-      require_once $swift_dir.'/classes/Swift.php';
-      Swift::registerAutoload($swift_dir.'/swift_init.php');
+      require_once $swift_dir.'/swift_required.php';
     }
 
     $config = $this->getFactoryConfiguration();

lib/vendor/swiftmailer

@@ -8,8 +8,7 @@
  * file that was distributed with this source code.
  */
 require_once __DIR__ . '/../../bootstrap/unit.php';
-require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib/classes/Swift.php';
-Swift::registerAutoload(sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib/swift_init.php');
+require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib/swift_required.php';
 require_once __DIR__.'/fixtures/TestMailerTransport.class.php';
 require_once __DIR__.'/fixtures/TestSpool.class.php';
 require_once __DIR__.'/fixtures/TestMailMessage.class.php';