Fix SwiftMailer use

Author: tchapi

src/Controller/DAVController.php

@@ -12,6 +12,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Twig\Environment as TwigEnvironment;
 
 class DAVController extends AbstractController
 {
@@ -74,6 +75,20 @@ class DAVController extends AbstractController
      */
     protected $em;
 
+    /**
+     * The Twig engine.
+     *
+     * @var Twig\Environment
+     */
+    protected $twig;
+
+    /**
+     * The Swift_Mailer mailer service.
+     *
+     * @var \Swift_Mailer
+     */
+    protected $mailer;
+
     /**
      * Base URI of the server.
      *
@@ -95,7 +110,7 @@ class DAVController extends AbstractController
      */
     protected $server;
 
-    public function __construct(BasicAuth $basicAuthBackend, UrlGeneratorInterface $router, EntityManagerInterface $entityManager, bool $calDAVEnabled = true, bool $cardDAVEnabled = true, bool $webDAVEnabled = false, ?string $inviteAddress, ?string $authMethod, ?string $authRealm, ?string $publicDir, ?string $tmpDir)
+    public function __construct(\Swift_Mailer $mailer, TwigEnvironment $twig, BasicAuth $basicAuthBackend, UrlGeneratorInterface $router, EntityManagerInterface $entityManager, bool $calDAVEnabled = true, bool $cardDAVEnabled = true, bool $webDAVEnabled = false, ?string $inviteAddress, ?string $authMethod, ?string $authRealm, ?string $publicDir, ?string $tmpDir)
     {
         $this->calDAVEnabled = $calDAVEnabled;
         $this->cardDAVEnabled = $cardDAVEnabled;
@@ -109,6 +124,8 @@ public function __construct(BasicAuth $basicAuthBackend, UrlGeneratorInterface $
         $this->tmpDir = $tmpDir;
 
         $this->em = $entityManager;
+        $this->twig = $twig;
+        $this->mailer = $mailer;
         $this->baseUri = $router->generate('dav', ['path' => '']);
 
         $this->basicAuthBackend = $basicAuthBackend;
@@ -199,7 +216,7 @@ private function initServer()
             $this->server->addPlugin(new \Sabre\CalDAV\SharingPlugin());
             $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
             if ($this->inviteAddress) {
-                $this->server->addPlugin(new DavisIMipPlugin($this->inviteAddress));
+                $this->server->addPlugin(new DavisIMipPlugin($this->twig, $this->mailer, $this->inviteAddress));
             }
         }
 

src/Plugins/DavisIMipPlugin.php

@@ -5,6 +5,7 @@
 use Sabre\CalDAV\Schedule\IMipPlugin as SabreBaseIMipPlugin;
 use Sabre\DAV;
 use Sabre\VObject\ITip;
+use Twig\Environment as TwigEnvironment;
 
 /**
  * iMIP handler.
@@ -13,6 +14,20 @@ class DavisIMipPlugin extends SabreBaseIMipPlugin
 {
     const MESSAGE_ORIGIN_INDICATOR = '(via Davis)';
 
+    /**
+     * The Twig engine.
+     *
+     * @var Twig\Environment
+     */
+    protected $twig;
+
+    /**
+     * The Swift_Mailer mailer service.
+     *
+     * @var \Swift_Mailer
+     */
+    protected $mailer;
+
     /**
      * Creates the email handler.
      *
@@ -21,8 +36,10 @@ class DavisIMipPlugin extends SabreBaseIMipPlugin
      *                             generally be some kind of no-reply email
      *                             address you own.
      */
-    public function __construct($senderEmail)
+    public function __construct(TwigEnvironment $twig, \Swift_Mailer $mailer, $senderEmail)
     {
+        $this->twig = $twig;
+        $this->mailer = $mailer;
         $this->senderEmail = $senderEmail;
     }
 
@@ -157,7 +174,7 @@ public function schedule(ITip\Message $itip)
                 $zoom = 16;
                 $width = 500;
                 $height = 220;
-                $locationImage = Swift_Image::fromPath(
+                $locationImage = \Swift_Image::fromPath(
                         'http://api.tiles.mapbox.com/v4'.
                         '/mapbox.streets'.
                         '/pin-m-star+285A98'.
@@ -212,33 +229,30 @@ public function schedule(ITip\Message $itip)
         ];
 
         $message->setBody(
-            $this->renderView(
+            $this->twig->render(
                 'mails/scheduling.html.twig',
                 $params
             ),
             'text/html'
         )
         ->addPart(
-            $this->renderView(
+            $this->twig->render(
                 'mails/scheduling.txt.twig',
                 $params
             ),
             'text/plain'
         );
 
         if (false === $deliveredLocally) {
-            $bodyAsStream = new Stringbuffer\Read();
-            $bodyAsStream->initializeWith($itip->message->serialize());
-
             // Attach the event file (invite.ics)
-            $attachment = (new Swift_Attachment())
+            $attachment = (new \Swift_Attachment())
                   ->setFilename('invite.ics')
                   ->setContentType('text/calendar; method='.(string) $itip->method.'; charset=UTF-8')
-                  ->setBody($bodyAsStream);
+                  ->setBody($itip->message->serialize());
             $message->attach($attachment);
         }
 
-        $mailer->send($message);
+        $this->mailer->send($message);
 
         if (false === $deliveredLocally) {
             $itip->scheduleStatus = '1.1;Scheduling message is sent via iMip.';