X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FUtil%2FEMailerTest.php;h=b43482b304fd51a5f8b0ccbc82179eef29a9171c;hb=360614d2cf3aceeb763ef1281ad5236878f5d735;hp=209195f7e807a731dde9867857eea6087468ee96;hpb=3038e4a3f9762639201a1fe9ca849c3338d7d9f4;p=friendica.git

diff --git a/tests/src/Util/EMailerTest.php b/tests/src/Util/EMailerTest.php
index 209195f7e8..b43482b304 100644
--- a/tests/src/Util/EMailerTest.php
+++ b/tests/src/Util/EMailerTest.php
@@ -1,11 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Test\src\Util;
 
 use Friendica\App\BaseURL;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Object\EMail\IEmail;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\EmailerSpy;
@@ -26,39 +45,34 @@ class EMailerTest extends MockedTest
 	use VFSTrait;
 	use HookMockTrait;
 
-	/** @var IConfig|MockInterface */
+	/** @var IManageConfigValues|MockInterface */
 	private $config;
-	/** @var IPConfig|MockInterface */
+	/** @var IManagePersonalConfigValues|MockInterface */
 	private $pConfig;
 	/** @var L10n|MockInterface */
 	private $l10n;
 	/** @var BaseURL|MockInterface */
 	private $baseUrl;
 
-	/** @var string */
-	private $defaultHeaders;
-
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
 		$this->setUpVfsDir();
 
-		$this->config  = \Mockery::mock(IConfig::class);
+		$this->config  = \Mockery::mock(IManageConfigValues::class);
 		$this->config->shouldReceive('get')->withArgs(['config', 'sender_email'])->andReturn('test@friendica.local')->once();
 		$this->config->shouldReceive('get')->withArgs(['config', 'sitename', 'Friendica Social Network'])->andReturn('Friendica Social Network')->once();
 		$this->config->shouldReceive('get')->withArgs(['system', 'sendmail_params', true])->andReturn(true);
 
-		$this->pConfig = \Mockery::mock(IPConfig::class);
+		$this->pConfig = \Mockery::mock(IManagePersonalConfigValues::class);
 		$this->l10n    = \Mockery::mock(L10n::class);
 		$this->baseUrl = \Mockery::mock(BaseURL::class);
 		$this->baseUrl->shouldReceive('getHostname')->andReturn('friendica.local');
 		$this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
-
-		$this->defaultHeaders = [];
 	}
 
-	protected function tearDown()
+	protected function tearDown(): void
 	{
 		EmailerSpy::$MAIL_DATA = [];
 
@@ -81,21 +95,21 @@ class EMailerTest extends MockedTest
 
 		$emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
 
-		$this->assertTrue($emailer->send($testEmail));
+		self::assertTrue($emailer->send($testEmail));
 
-		$this->assertContains("X-Friendica-Host : friendica.local", EmailerSpy::$MAIL_DATA['headers']);
-		$this->assertContains("X-Friendica-Platform : Friendica", EmailerSpy::$MAIL_DATA['headers']);
-		$this->assertContains("List-ID : <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
-		$this->assertContains("List-Archive : <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
-		$this->assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
-		$this->assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
+		self::assertStringContainsString("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']);
+		self::assertStringContainsString("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']);
+		self::assertStringContainsString("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
+		self::assertStringContainsString("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
+		self::assertStringContainsString("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
+		self::assertStringContainsString("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
 		// Base64 "Test Text"
-		$this->assertContains(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']);
+		self::assertStringContainsString(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']);
 		// Base64 "Test Message<b>Bold</b>"
-		$this->assertContains(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
-		$this->assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']);
-		$this->assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']);
-		$this->assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']);
+		self::assertStringContainsString(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
+		self::assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']);
+		self::assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']);
+		self::assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']);
 	}
 
 	public function testTwoMessageIds()
@@ -124,10 +138,10 @@ class EMailerTest extends MockedTest
 		$emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
 
 		// even in case there are two message ids, send the mail anyway
-		$this->assertTrue($emailer->send($testEmail));
+		self::assertTrue($emailer->send($testEmail));
 
 		// check case sensitive key problem
-		$this->assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader());
-		$this->assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader());
+		self::assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader());
+		self::assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader());
 	}
 }