wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update casing of PHP inside method name

Browse source 
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
})
}
if (data.isPhpMailerUsed) {
if (data.isPHPMailerUsed) {
messages.push({
msg: t(
'core',

4
settings/Controller/CheckSetupController.php
View file

@ -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(),

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

@ -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() {