From 96126d235fe87dc4b81ca82c5ebaa495039c3b3c Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 27 May 2021 16:24:48 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02214=20Add=20PHP=20check=20in=20CLI=20sc?= =?UTF-8?q?ripts=20(fix=20some=20checks=20and=20title)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup/setuputils.class.inc.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 9757043c6..df215496d 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -143,7 +143,12 @@ class SetupUtils self::CheckPhpVersion($aResult); // 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); $aMandatoryExtensions = self::GetPHPMandatoryExtensions(); @@ -411,14 +416,15 @@ class SetupUtils * * @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(); $aPhpCheckErrors = CheckResult::FilterCheckResultArray($aPhpCheckResults, [CheckResult::ERROR]); if (empty($aPhpCheckErrors)) { return; } - $sMessageTitle = 'Error: PHP minimum requirements are not met !'; + $sMessageTitle = 'Error: Requirements are not met !'; $oCliPage->p($sMessageTitle); $aPhpCheckErrorsForPrint = CheckResult::FromObjectsToStrings($aPhpCheckErrors); foreach ($aPhpCheckErrorsForPrint as $sError) {