Skip to content

Commit

Permalink
Merge pull request #12529 from nextcloud/backport/12401/php-warning
Browse files Browse the repository at this point in the history
[stable14] Fix the warning appearing in the admin section when mail_smtpmode is not configured
  • Loading branch information
rullzer authored Nov 19, 2018
2 parents 079e59d + 511eade commit b133ca3
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion settings/Controller/CheckSetupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,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 {
Expand Down
33 changes: 33 additions & 0 deletions tests/Settings/Controller/CheckSetupControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,39 @@ 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,
])
->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([
Expand Down

0 comments on commit b133ca3

Please sign in to comment.