feat(Mailer): implement caching

Currently $this->instance is never set, so the code is no-op. This
brings back caching of the instance.

Caching broke with

   be7db1573dc8c6e7309ec9db124a7a74b8b41199

   Swift to \Swift_Mailer as abstraction

Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>

diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php
index da3fcd35888716e9714c205581460f71b0898298..b0c08815f1ef0e127a9804aa33dea10660c4fee7 100644 (file)
--- a/lib/private/Mail/Mailer.php
+++ b/lib/private/Mail/Mailer.php
@@ -267,7 +267,9 @@ class Mailer implements IMailer {
                                break;
                }
 
-               return new SymfonyMailer($transport);
+               $this->instance = new SymfonyMailer($transport);
+
+               return $this->instance;
        }
 
        /**

diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php
index f215e385e3f75ca7f637c91b8f5199e15cf6664d..84015f38d242cffe2d1a393d0bd0954116cbbe97 100644 (file)
--- a/tests/lib/Mail/MailerTest.php
+++ b/tests/lib/Mail/MailerTest.php
@@ -337,4 +337,10 @@ class MailerTest extends TestCase {
                self::assertInstanceOf(EsmtpTransport::class, $transport);
                self::assertEquals('[127.0.0.1]', $transport->getLocalDomain());
        }
+
+       public function testCaching(): void {
+               $symfonyMailer1 = self::invokePrivate($this->mailer, 'getInstance');
+               $symfonyMailer2 = self::invokePrivate($this->mailer, 'getInstance');
+               self::assertSame($symfonyMailer1, $symfonyMailer2);
+       }
 }