mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update casing of PHP inside method name 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2018-12-04 17:58:35 +01:00
parent f5ad80fc57
commit 5b22225351
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/setupchecks.js
View File

@ -353,7 +353,7 @@
type: OC.SetupChecks.MESSAGE_TYPE_WARNING type: OC.SetupChecks.MESSAGE_TYPE_WARNING
}) })
} }
if (data.isPhpMailerUsed) { if (data.isPHPMailerUsed) {
messages.push({ messages.push({
msg: t( msg: t(
'core', 'core',

4
settings/Controller/CheckSetupController.php
View File

@ -527,7 +527,7 @@ Raw output
return []; return [];
} }
protected function isPhpMailerUsed(): bool { protected function isPHPMailerUsed(): bool {
return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php'; return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php';
} }
@ -638,7 +638,7 @@ Raw output
'missingIndexes' => $this->hasMissingIndexes(), 'missingIndexes' => $this->hasMissingIndexes(),
'isSqliteUsed' => $this->isSqliteUsed(), 'isSqliteUsed' => $this->isSqliteUsed(),
'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'), 'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
'isPhpMailerUsed' => $this->isPhpMailerUsed(), 'isPHPMailerUsed' => $this->isPHPMailerUsed(),
'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'), 'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'),
'isMemoryLimitSufficient' => $this->memoryInfo->isMemoryLimitSufficient(), 'isMemoryLimitSufficient' => $this->memoryInfo->isMemoryLimitSufficient(),
'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(), 'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(),

12
tests/Settings/Controller/CheckSetupControllerTest.php
View File

@ -155,7 +155,7 @@ class CheckSetupControllerTest extends TestCase {
'hasFreeTypeSupport', 'hasFreeTypeSupport',
'hasMissingIndexes', 'hasMissingIndexes',
'isSqliteUsed', 'isSqliteUsed',
'isPhpMailerUsed', 'isPHPMailerUsed',
'hasOpcacheLoaded', 'hasOpcacheLoaded',
'getAppDirsWithDifferentOwner', 'getAppDirsWithDifferentOwner',
'hasRecommendedPHPModules', 'hasRecommendedPHPModules',
@ -473,7 +473,7 @@ class CheckSetupControllerTest extends TestCase {
]); ]);
$this->checkSetupController $this->checkSetupController
->expects($this->once()) ->expects($this->once())
->method('isPhpMailerUsed') ->method('isPHPMailerUsed')
->willReturn(false); ->willReturn(false);
$this->checker $this->checker
->expects($this->once()) ->expects($this->once())
@ -531,7 +531,7 @@ class CheckSetupControllerTest extends TestCase {
'isSqliteUsed' => false, 'isSqliteUsed' => false,
'databaseConversionDocumentation' => 'http://docs.example.org/server/go.php?to=admin-db-conversion', 'databaseConversionDocumentation' => 'http://docs.example.org/server/go.php?to=admin-db-conversion',
'missingIndexes' => [], 'missingIndexes' => [],
'isPhpMailerUsed' => false, 'isPHPMailerUsed' => false,
'mailSettingsDocumentation' => 'https://server/index.php/settings/admin', 'mailSettingsDocumentation' => 'https://server/index.php/settings/admin',
'isMemoryLimitSufficient' => true, 'isMemoryLimitSufficient' => true,
'appDirsWithDifferentOwner' => [], 'appDirsWithDifferentOwner' => [],
@ -541,7 +541,7 @@ class CheckSetupControllerTest extends TestCase {
$this->assertEquals($expected, $this->checkSetupController->check()); $this->assertEquals($expected, $this->checkSetupController->check());
} }
public function testIsPhpMailerUsed() { public function testIsPHPMailerUsed() {
$checkSetupController = $this->getMockBuilder('\OC\Settings\Controller\CheckSetupController') $checkSetupController = $this->getMockBuilder('\OC\Settings\Controller\CheckSetupController')
->setConstructorArgs([ ->setConstructorArgs([
'settings', 'settings',
@ -571,8 +571,8 @@ class CheckSetupControllerTest extends TestCase {
->with('mail_smtpmode', 'smtp') ->with('mail_smtpmode', 'smtp')
->will($this->returnValue('not-php')); ->will($this->returnValue('not-php'));
$this->assertTrue($this->invokePrivate($checkSetupController, 'isPhpMailerUsed')); $this->assertTrue($this->invokePrivate($checkSetupController, 'isPHPMailerUsed'));
$this->assertFalse($this->invokePrivate($checkSetupController, 'isPhpMailerUsed')); $this->assertFalse($this->invokePrivate($checkSetupController, 'isPHPMailerUsed'));
} }
public function testGetCurlVersion() { public function testGetCurlVersion() {