diff options
| -rw-r--r-- | lib/private/Mail/EMailTemplate.php | 2 | ||||
| -rw-r--r-- | lib/public/Mail/IEMailTemplate.php | 2 | ||||
| -rw-r--r-- | tests/lib/Mail/MailerTest.php | 4 | ||||
| -rw-r--r-- | tests/lib/Mail/MessageTest.php | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index dd62490edeb..38ecc966408 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -555,7 +555,7 @@ EOF; * * @since 12.0.0 */ - public function addBodyButton(string $text, string $url, string $plainText = '') { + public function addBodyButton(string $text, string $url, $plainText = '') { if ($this->footerAdded) { return; } diff --git a/lib/public/Mail/IEMailTemplate.php b/lib/public/Mail/IEMailTemplate.php index 6abcdd12b9c..e7a16e618cf 100644 --- a/lib/public/Mail/IEMailTemplate.php +++ b/lib/public/Mail/IEMailTemplate.php @@ -132,7 +132,7 @@ interface IEMailTemplate { * * @since 12.0.0 */ - public function addBodyButton(string $text, string $url, string $plainText = ''); + public function addBodyButton(string $text, string $url, $plainText = ''); /** * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php index f647b966f1f..b0955a5d2fe 100644 --- a/tests/lib/Mail/MailerTest.php +++ b/tests/lib/Mail/MailerTest.php @@ -133,6 +133,10 @@ class MailerTest extends TestCase { } public function testCreateEMailTemplate() { + $this->config->method('getSystemValue') + ->with('mail_template_class', '') + ->willReturnArgument(1); + $this->assertSame(EMailTemplate::class, get_class($this->mailer->createEMailTemplate('tests.MailerTest'))); } } diff --git a/tests/lib/Mail/MessageTest.php b/tests/lib/Mail/MessageTest.php index 691168ce24c..78fd5f1bb8b 100644 --- a/tests/lib/Mail/MessageTest.php +++ b/tests/lib/Mail/MessageTest.php @@ -30,7 +30,7 @@ class MessageTest extends TestCase { ); } - function setUp() { + public function setUp() { parent::setUp(); $this->swiftMessage = $this->getMockBuilder('\Swift_Message') @@ -79,9 +79,9 @@ class MessageTest extends TestCase { $this->swiftMessage ->expects($this->once()) ->method('getReplyTo') - ->will($this->returnValue(['lukas@owncloud.com'])); + ->willReturn('lukas@owncloud.com'); - $this->assertSame(['lukas@owncloud.com'], $this->message->getReplyTo()); + $this->assertSame('lukas@owncloud.com', $this->message->getReplyTo()); } public function testSetTo() { |