Merge pull request #12401 from pachulo/fix/11107/fix-php-mail-warning

Fix the warning appearing in the admin section when mail_smtpmode is not configured
nextcloud · Nov 19, 2018 · 5af6289 · 5af6289
2 parents ea46c11 + 8e4f0f9
commit 5af6289
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
@@ -530,7 +530,7 @@ protected function getCronErrors() {
 	}
 
 	protected function isPhpMailerUsed(): bool {
-		return $this->config->getSystemValue('mail_smtpmode', 'php') === 'php';
+		return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php';
 	}
 
 	protected function hasOpcacheLoaded(): bool {

diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -520,6 +520,40 @@ public function testCheck() {
 		$this->assertEquals($expected, $this->checkSetupController->check());
 	}
 
+	public function testIsPhpMailerUsed() {
+		$checkSetupController = $this->getMockBuilder('\OC\Settings\Controller\CheckSetupController')
+			->setConstructorArgs([
+				'settings',
+				$this->request,
+				$this->config,
+				$this->clientService,
+				$this->urlGenerator,
+				$this->util,
+				$this->l10n,
+				$this->checker,
+				$this->logger,
+				$this->dispatcher,
+				$this->db,
+				$this->lockingProvider,
+				$this->dateTimeFormatter,
+				$this->memoryInfo,
+				$this->secureRandom,
+			])
+			->setMethods(null)->getMock();
+
+		$this->config->expects($this->at(0))
+			->method('getSystemValue')
+			->with('mail_smtpmode', 'smtp')
+			->will($this->returnValue('php'));
+		$this->config->expects($this->at(1))
+			->method('getSystemValue')
+			->with('mail_smtpmode', 'smtp')
+			->will($this->returnValue('not-php'));
+
+		$this->assertTrue($this->invokePrivate($checkSetupController, 'isPhpMailerUsed'));
+		$this->assertFalse($this->invokePrivate($checkSetupController, 'isPhpMailerUsed'));
+	}
+
 	public function testGetCurlVersion() {
 		$checkSetupController = $this->getMockBuilder('\OC\Settings\Controller\CheckSetupController')
 			->setConstructorArgs([