diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 97c28a69f68..222b12b8f40 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -353,7 +353,7 @@ type: OC.SetupChecks.MESSAGE_TYPE_WARNING }) } - if (data.isPhpMailerUsed) { + if (data.isPHPMailerUsed) { messages.push({ msg: t( 'core', diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index 6d6c27ee8e6..4211b9b4c6c 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -527,7 +527,7 @@ Raw output return []; } - protected function isPhpMailerUsed(): bool { + protected function isPHPMailerUsed(): bool { return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php'; } @@ -638,7 +638,7 @@ Raw output 'missingIndexes' => $this->hasMissingIndexes(), 'isSqliteUsed' => $this->isSqliteUsed(), 'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'), - 'isPhpMailerUsed' => $this->isPhpMailerUsed(), + 'isPHPMailerUsed' => $this->isPHPMailerUsed(), 'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'), 'isMemoryLimitSufficient' => $this->memoryInfo->isMemoryLimitSufficient(), 'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(), diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php index e85750f6b14..360bd27f254 100644 --- a/tests/Settings/Controller/CheckSetupControllerTest.php +++ b/tests/Settings/Controller/CheckSetupControllerTest.php @@ -155,7 +155,7 @@ class CheckSetupControllerTest extends TestCase { 'hasFreeTypeSupport', 'hasMissingIndexes', 'isSqliteUsed', - 'isPhpMailerUsed', + 'isPHPMailerUsed', 'hasOpcacheLoaded', 'getAppDirsWithDifferentOwner', 'hasRecommendedPHPModules', @@ -473,7 +473,7 @@ class CheckSetupControllerTest extends TestCase { ]); $this->checkSetupController ->expects($this->once()) - ->method('isPhpMailerUsed') + ->method('isPHPMailerUsed') ->willReturn(false); $this->checker ->expects($this->once()) @@ -531,7 +531,7 @@ class CheckSetupControllerTest extends TestCase { 'isSqliteUsed' => false, 'databaseConversionDocumentation' => 'http://docs.example.org/server/go.php?to=admin-db-conversion', 'missingIndexes' => [], - 'isPhpMailerUsed' => false, + 'isPHPMailerUsed' => false, 'mailSettingsDocumentation' => 'https://server/index.php/settings/admin', 'isMemoryLimitSufficient' => true, 'appDirsWithDifferentOwner' => [], @@ -541,7 +541,7 @@ class CheckSetupControllerTest extends TestCase { $this->assertEquals($expected, $this->checkSetupController->check()); } - public function testIsPhpMailerUsed() { + public function testIsPHPMailerUsed() { $checkSetupController = $this->getMockBuilder('\OC\Settings\Controller\CheckSetupController') ->setConstructorArgs([ 'settings', @@ -571,8 +571,8 @@ class CheckSetupControllerTest extends TestCase { ->with('mail_smtpmode', 'smtp') ->will($this->returnValue('not-php')); - $this->assertTrue($this->invokePrivate($checkSetupController, 'isPhpMailerUsed')); - $this->assertFalse($this->invokePrivate($checkSetupController, 'isPhpMailerUsed')); + $this->assertTrue($this->invokePrivate($checkSetupController, 'isPHPMailerUsed')); + $this->assertFalse($this->invokePrivate($checkSetupController, 'isPHPMailerUsed')); } public function testGetCurlVersion() {