Replace SwiftMailer by Symfony Mailer

app/AppKernel.php

@@ -13,7 +13,6 @@ class AppKernel extends Kernel
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
-            new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new FOS\RestBundle\FOSRestBundle(),

app/config/config.yml

@@ -34,6 +34,8 @@ framework:
     fragments: ~
     http_method_override: true
     assets: ~
+    mailer:
+        dsn: "%mailer_dsn%"
 
 # Twig Configuration
 twig:
@@ -78,18 +80,6 @@ doctrine_migrations:
     table_name: migration_versions
     name: Application Migrations
 
-# Swiftmailer Configuration
-swiftmailer:
-    transport:   "%mailer_transport%"
-    username:    "%mailer_user%"
-    password:    "%mailer_password%"
-    host:        "%mailer_host%"
-    port:        "%mailer_port%"
-    encryption:  "%mailer_encryption%"
-    auth_mode:   "%mailer_auth_mode%"
-    spool:
-        type: memory
-
 fos_rest:
     param_fetcher_listener: true
     body_listener: true
@@ -183,7 +173,7 @@ fos_user:
         address: "%from_email%"
         sender_name: wallabag
     service:
-        mailer: fos_user.mailer.twig_swift
+        mailer: Wallabag\UserBundle\Mailer\UserMailer
 
 fos_oauth_server:
     db_driver:           orm

app/config/config_dev.yml

@@ -8,6 +8,10 @@ framework:
     profiler:
         only_exceptions: false
 
+    mailer:
+        # see https://mailcatcher.me/
+        dsn: smtp://127.0.0.1:1025
+
 web_profiler:
     toolbar: true
     intercept_redirects: false
@@ -35,12 +39,6 @@ monolog:
                 VERBOSITY_DEBUG: DEBUG
             channels: [doctrine]
 
-swiftmailer:
-    # see https://mailcatcher.me/
-    transport: smtp
-    host: 'localhost'
-    port: 1025
-
 # If you want to use cache for queries used in WallabagExtension
 # Uncomment the following lines
 #doctrine:

app/config/config_test.yml

@@ -11,16 +11,13 @@ framework:
         collect: false
     translator:
         enabled: false
+    mailer:
+        dsn: 'null://null'
 
 web_profiler:
     toolbar: false
     intercept_redirects: false
 
-swiftmailer:
-    # to be able to read emails sent
-    spool:
-        type: file
-
 doctrine:
     dbal:
         driver: "%test_database_driver%"

app/config/parameters.yml.dist

@@ -26,13 +26,7 @@ parameters:
     domain_name: https://your-wallabag-url-instance.com
     server_name: "Your wallabag instance"
 
-    mailer_transport:  smtp
-    mailer_user:       ~
-    mailer_password:   ~
-    mailer_host:       127.0.0.1
-    mailer_port:       false
-    mailer_encryption: ~
-    mailer_auth_mode:  ~
+    mailer_dsn: smtp://127.0.0.1
 
     locale: en
 

app/config/services.yml

@@ -200,6 +200,16 @@ services:
     wallabag_core.entry.download_images.client:
         alias: 'httplug.client.wallabag_core.entry.download_images'
 
+    Wallabag\UserBundle\Mailer\UserMailer:
+        arguments:
+            $parameters:
+                template:
+                    confirmation: '%fos_user.registration.confirmation.template%'
+                    resetting: '%fos_user.resetting.email.template%'
+                from_email:
+                    confirmation: '%fos_user.registration.confirmation.from_email%'
+                    resetting: '%fos_user.resetting.email.from_email%'
+
     Wallabag\UserBundle\EventListener\CreateConfigListener:
         arguments:
             $itemsOnPage: "%wallabag_core.items_on_page%"