Merge pull request #4 from vemaeg/swiftmailer-6

Swiftmailer 6

Author: thirsch

README.md

@@ -43,7 +43,7 @@ See http://symfony.com/legacy/doc/getting-started/1_4/en/03-Symfony-Installation
 
 Option 1: Using [Composer](http://getcomposer.org/doc/00-intro.md) as dependency management:
 
-    composer require lexpress/symfony1 "1.5.*"
+    composer require friendsofsymfony1/symfony1 "1.5.*"
     composer install
 
 Note: On windows, if your project is a few directories down from the drive root, composer can throw an error  relating to ZipArchive::extractTo(), this can be because pathnames are too long. There currently appears to be no proper solution but a workaround is to move your project to the drive root, run the commands from there, where they will run happily, and then move your project back. 

autoload.php

@@ -3,8 +3,3 @@
 require_once __DIR__.'/lib/autoload/sfCoreAutoload.class.php';
 
 sfCoreAutoload::register();
-
-// Register sfMailerSwiftmailer6 as default sfMailer, if Swiftmailer ~6.0 has been loaded.
-if(version_compare(Swift::VERSION, '6.0.0') >= 0) {
-  sfConfig::set('sf_factory_mailer', 'sfMailerSwiftmailer6');
-}

lib/autoload/sfCoreAutoload.class.php

@@ -342,9 +342,7 @@ static public function make()
     'sfvarlogger' => 'log/sfVarLogger.class.php',
     'sfwebdebuglogger' => 'log/sfWebDebugLogger.class.php',
     'sfmailer' => 'mailer/sfMailer.class.php',
-    'sfmailerbase' => 'mailer/sfMailerBase.class.php',
     'sfmailermessageloggerplugin' => 'mailer/sfMailerMessageLoggerPlugin.class.php',
-    'sfmailerswiftmailer6' => 'mailer/sfMailerSwiftmailer6.class.php',
     'sfnomailer' => 'mailer/sfNoMailer.class.php',
     'sfpearconfig' => 'plugin/sfPearConfig.class.php',
     'sfpeardownloader' => 'plugin/sfPearDownloader.class.php',