Fix email debug

Author: dereuromark

src/Mailer/Mailer.php

@@ -34,6 +34,11 @@ class Mailer extends CakeMailer {
 	 */
 	protected $localeBefore;
 
+	/**
+	 * @var array
+	 */
+	protected $debug = [];
+
 	/**
 	 * Magic method to forward method class to Message instance.
 	 *
@@ -143,11 +148,33 @@ protected function detectPrimaryLocale(): ?string {
 		return $primaryLocale;
 	}
 
+	/**
+	 * Render content and send email using configured transport.
+	 *
+	 * @param string $content Content.
+	 * @return array
+	 * @psalm-return array{headers: string, message: string}
+	 */
+	public function deliver(string $content = '')
+	{
+		$this->debug = parent::deliver($content);
+
+		return $this->debug;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getDebug(): array{
+		return $this->debug;
+	}
+
 	/**
 	 * @return $this
 	 */
 	public function reset() {
 		$this->locale = null;
+		$this->debug = [];
 
 		return parent::reset();
 	}

tests/TestCase/Mailer/MailerTest.php

@@ -11,9 +11,6 @@
 use TestApp\Mailer\TestMailer;
 use Tools\Mailer\Mailer;
 
-/**
- * EmailTest class
- */
 class MailerTest extends TestCase {
 
 	/**
@@ -32,7 +29,6 @@ public function setUp(): void {
 		I18n::setLocale(I18n::getDefaultLocale());
 		Configure::write('Config.defaultLocale', 'deu');
 
-		//Mailer::setConfig('test');
 		TransportFactory::setConfig('debug', [
 			'className' => 'Debug',
 		]);
@@ -124,7 +120,7 @@ public function testDeliverLocaleCustom(): void {
 	public function testAddEmbeddedAttachmentSend() {
 		$file = Plugin::path('Tools') . 'tests' . DS . 'test_files' . DS . 'img' . DS . 'hotel.png';
 
-		Configure::write('debug', 0);
+		//Configure::write('debug', 0);
 		$this->mailer->setEmailFormat('both');
 		$this->mailer->setTo(Configure::read('Config.adminEmail'));
 		$cid = $this->mailer->addEmbeddedAttachment($file);
@@ -147,11 +143,14 @@ public function testAddEmbeddedAttachmentSend() {
 		$text = trim(strip_tags($html));
 		$this->mailer->setViewVars(compact('text', 'html'));
 
-		$res = $this->mailer->send();
-		Configure::write('debug', 2);
+		$res = $this->mailer->deliver();
+		//Configure::write('debug', 2);
 
-		//$this->assertEquals('', $this->mailer->getError());
 		$this->assertTrue((bool)$res);
+
+		$debug = $this->mailer->getDebug();
+		//FIXME
+		//$this->assertTextContains('test_embedded_default', $debug['message']);
 	}
 
 	/**