composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2214 Add PHP check in CLI scripts (fix some checks and title)

Browse Source
This commit is contained in:
Eric
2021-05-27 16:24:48 +02:00
parent da7d3731dc
commit c0e1f9dcc0
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
setup/setuputils.class.inc.php
View File

@@ -143,7 +143,12 @@ class SetupUtils
self::CheckPhpVersion($aResult); self::CheckPhpVersion($aResult);
// Check the common directories // Check the common directories
$aWritableDirsErrors = self::CheckWritableDirs(array('log', 'env-production', 'env-production-build', 'conf', 'data')); if (utils::IsModeCLI()) {
$aWritableDirs = ['log', 'data'];
} else {
$aWritableDirs = ['log', 'env-production', 'env-production-build', 'conf', 'data'];
}
$aWritableDirsErrors = self::CheckWritableDirs($aWritableDirs);
$aResult = array_merge($aResult, $aWritableDirsErrors); $aResult = array_merge($aResult, $aWritableDirsErrors);
$aMandatoryExtensions = self::GetPHPMandatoryExtensions(); $aMandatoryExtensions = self::GetPHPMandatoryExtensions();
@@ -411,14 +416,15 @@ class SetupUtils
* *
* @since 3.0.0 N°2214 Add PHP version checks in CLI scripts * @since 3.0.0 N°2214 Add PHP version checks in CLI scripts
*/ */
public static function CheckPhpAndExtensionsForCli($oCliPage, $iExitCode = -1) { public static function CheckPhpAndExtensionsForCli($oCliPage, $iExitCode = -1)
{
$aPhpCheckResults = self::CheckPhpAndExtensions(); $aPhpCheckResults = self::CheckPhpAndExtensions();
$aPhpCheckErrors = CheckResult::FilterCheckResultArray($aPhpCheckResults, [CheckResult::ERROR]); $aPhpCheckErrors = CheckResult::FilterCheckResultArray($aPhpCheckResults, [CheckResult::ERROR]);
if (empty($aPhpCheckErrors)) { if (empty($aPhpCheckErrors)) {
return; return;
} }
$sMessageTitle = 'Error: PHP minimum requirements are not met !'; $sMessageTitle = 'Error: Requirements are not met !';
$oCliPage->p($sMessageTitle); $oCliPage->p($sMessageTitle);
$aPhpCheckErrorsForPrint = CheckResult::FromObjectsToStrings($aPhpCheckErrors); $aPhpCheckErrorsForPrint = CheckResult::FromObjectsToStrings($aPhpCheckErrors);
foreach ($aPhpCheckErrorsForPrint as $sError) { foreach ($aPhpCheckErrorsForPrint as $sError) {