clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6312 from annando/check-json

Browse Source 
Checks if JSON is enabled
This commit is contained in:
Hypolite Petovan
2018-12-23 18:53:32 -05:00
committed by GitHub
parent d7d685ad6b 75e63212d1
commit a16e8d97f6
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Core/Installer.php
View File

@@ -440,6 +440,13 @@ class Installer
); );
$returnVal = $returnVal ? $status : false; $returnVal = $returnVal ? $status : false;
$status = $this->checkFunction('json_encode',
L10n::t('JSON PHP module'),
L10n::t('Error: JSON PHP module required but not installed.'),
true
);
$returnVal = $returnVal ? $status : false;
return $returnVal; return $returnVal;
} }

16
tests/src/Core/InstallerTest.php
View File

@@ -43,6 +43,8 @@ class InstallerTest extends MockedTest
$this->mockL10nT('Error: iconv PHP module required but not installed.', 1); $this->mockL10nT('Error: iconv PHP module required but not installed.', 1);
$this->mockL10nT('POSIX PHP module', 1); $this->mockL10nT('POSIX PHP module', 1);
$this->mockL10nT('Error: POSIX PHP module required but not installed.', 1); $this->mockL10nT('Error: POSIX PHP module required but not installed.', 1);
$this->mockL10nT('JSON PHP module', 1);
$this->mockL10nT('Error: JSON PHP module required but not installed.', 1);
} }
private function assertCheckExist($position, $title, $help, $status, $required, $assertionArray) private function assertCheckExist($position, $title, $help, $status, $required, $assertionArray)
@@ -177,6 +179,17 @@ class InstallerTest extends MockedTest
true, true,
$install->getChecks()); $install->getChecks());
$this->mockFunctionL10TCalls();
$this->setFunctions(['json_encode' => false]);
$install = new Installer();
$this->assertFalse($install->checkFunctions());
$this->assertCheckExist(9,
'JSON PHP module',
'Error: JSON PHP module required but not installed.',
false,
true,
$install->getChecks());
$this->mockFunctionL10TCalls(); $this->mockFunctionL10TCalls();
$this->setFunctions([ $this->setFunctions([
'curl_init' => true, 'curl_init' => true,
@@ -184,7 +197,8 @@ class InstallerTest extends MockedTest
'openssl_public_encrypt' => true, 'openssl_public_encrypt' => true,
'mb_strlen' => true, 'mb_strlen' => true,
'iconv_strlen' => true, 'iconv_strlen' => true,
'posix_kill' => true 'posix_kill' => true,
'json_encode' => true
]); ]);
$install = new Installer(); $install = new Installer();
$this->assertTrue($install->checkFunctions()); $this->assertTrue($install->checkFunctions());