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

Disable some server checks when running on HHVM 

Ref https://github.com/owncloud/core/issues/10837#issuecomment-76516839
This commit is contained in:
Lukas Reschke 2015-02-28 10:08:41 +01:00
parent 42f6448da2
commit 4100610390
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/private/util.php
View File

@ -608,6 +608,13 @@ class OC_Util {
$invalidIniSettings = []; $invalidIniSettings = [];
$moduleHint = $l->t('Please ask your server administrator to install the module.'); $moduleHint = $l->t('Please ask your server administrator to install the module.');
/**
* FIXME: The dependency check does not work properly on HHVM on the moment
* and prevents installation. Once HHVM is more compatible with our
* approach to check for these values we should re-enable those
* checks.
*/
if (!self::runningOnHhvm()) {
foreach ($dependencies['classes'] as $class => $module) { foreach ($dependencies['classes'] as $class => $module) {
if (!class_exists($class)) { if (!class_exists($class)) {
$missingDependencies[] = $module; $missingDependencies[] = $module;
@ -623,24 +630,25 @@ class OC_Util {
$missingDependencies[] = $module; $missingDependencies[] = $module;
} }
} }
foreach($dependencies['ini'] as $setting => $expected) { foreach ($dependencies['ini'] as $setting => $expected) {
$iniWrapper = \OC::$server->getIniWrapper(); $iniWrapper = \OC::$server->getIniWrapper();
if(is_bool($expected)) { if (is_bool($expected)) {
if($iniWrapper->getBool($setting) !== $expected) { if ($iniWrapper->getBool($setting) !== $expected) {
$invalidIniSettings[] = [$setting, $expected]; $invalidIniSettings[] = [$setting, $expected];
} }
} }
if(is_int($expected)) { if (is_int($expected)) {
if($iniWrapper->getNumeric($setting) !== $expected) { if ($iniWrapper->getNumeric($setting) !== $expected) {
$invalidIniSettings[] = [$setting, $expected]; $invalidIniSettings[] = [$setting, $expected];
} }
} }
if(is_string($expected)) { if (is_string($expected)) {
if(strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) { if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
$invalidIniSettings[] = [$setting, $expected]; $invalidIniSettings[] = [$setting, $expected];
} }
} }
} }
}
foreach($missingDependencies as $missingDependency) { foreach($missingDependencies as $missingDependency) {
$errors[] = array( $errors[] = array(