From 1c0bf29a2d57d69adc9e4c7c33e011974d9aa393 Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:43:20 +0200 Subject: [PATCH 1/3] fix(setupchecks): Skip checking for OPcache if running from CLI Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- apps/settings/lib/SetupChecks/PhpOpcacheSetup.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php b/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php index a89916f5edbbb..371ef9289e8c1 100644 --- a/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php +++ b/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php @@ -131,6 +131,11 @@ protected function getOpcacheSetupRecommendations(): array { } public function run(): SetupResult { + // Skip OPcache checks if running from CLI + if (PHP_SAPI === 'cli') { + return SetupResult::success($this->l10n->t('Checking from CLI, OPcache checks have been skipped.')); + } + [$level,$recommendations] = $this->getOpcacheSetupRecommendations(); if (!empty($recommendations)) { return match($level) { From 48309c7bc7445eb2671fbc212874d3147e3274ce Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:09:29 +0200 Subject: [PATCH 2/3] fix: check both CLI and value Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- apps/settings/lib/SetupChecks/PhpOpcacheSetup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php b/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php index 371ef9289e8c1..f50ec80a3de9b 100644 --- a/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php +++ b/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php @@ -132,7 +132,7 @@ protected function getOpcacheSetupRecommendations(): array { public function run(): SetupResult { // Skip OPcache checks if running from CLI - if (PHP_SAPI === 'cli') { + if (OC::$CLI && !$this->iniGetWrapper->getBool('opcache.enable_cli')) { return SetupResult::success($this->l10n->t('Checking from CLI, OPcache checks have been skipped.')); } From 356c49d0267411d76c17ad1a573df411d1b72f75 Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:11:35 +0200 Subject: [PATCH 3/3] fix: typo Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- apps/settings/lib/SetupChecks/PhpOpcacheSetup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php b/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php index f50ec80a3de9b..4077203bb8ed1 100644 --- a/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php +++ b/apps/settings/lib/SetupChecks/PhpOpcacheSetup.php @@ -132,7 +132,7 @@ protected function getOpcacheSetupRecommendations(): array { public function run(): SetupResult { // Skip OPcache checks if running from CLI - if (OC::$CLI && !$this->iniGetWrapper->getBool('opcache.enable_cli')) { + if (\OC::$CLI && !$this->iniGetWrapper->getBool('opcache.enable_cli')) { return SetupResult::success($this->l10n->t('Checking from CLI, OPcache checks have been skipped.')); }