From 14537a07af38778d8c6f38bdcbcfa0490c96d726 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 9 May 2019 12:25:53 +0200 Subject: [PATCH] Remove recommendation for opcache on CLI Signed-off-by: Morris Jobke --- core/js/setupchecks.js | 2 +- core/js/tests/specs/setupchecksSpec.js | 2 +- settings/Controller/CheckSetupController.php | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index b290bddadf42b..2e4901a10c5d9 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -320,7 +320,7 @@ { docLink: data.phpOpcacheDocumentation, } - ) + "
opcache.enable=1\nopcache.enable_cli=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1
", + ) + "
opcache.enable=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1
", type: OC.SetupChecks.MESSAGE_TYPE_INFO }); } diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index 0603ac7228122..b5248add98441 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -778,7 +778,7 @@ describe('OC.SetupChecks tests', function() { async.done(function( data, s, x ){ expect(data).toEqual([{ - msg: 'The PHP OPcache is not properly configured. For better performance it is recommended to use the following settings in the php.ini:' + "
opcache.enable=1\nopcache.enable_cli=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1
", + msg: 'The PHP OPcache is not properly configured. For better performance it is recommended to use the following settings in the php.ini:' + "
opcache.enable=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1
", type: OC.SetupChecks.MESSAGE_TYPE_INFO }]); done(); diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index f1da8406edb5f..f760eefacb60c 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -413,10 +413,6 @@ protected function isOpcacheProperlySetup() { return false; } - if(!$iniWrapper->getBool('opcache.enable_cli')) { - return false; - } - if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) { return false; }