From bcc0e5c7e0ba9715df1ad5b78cb760722112df4e Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 9 May 2019 12:25:53 +0200 Subject: 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 5061b769d00..e59cca62674 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -252,7 +252,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 7ddaffc1594..c9598d4747a 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -671,7 +671,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 224c0cb30d3..c41cea6c2e0 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -411,10 +411,6 @@ Raw output return false; } - if(!$iniWrapper->getBool('opcache.enable_cli')) { - return false; - } - if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) { return false; } -- cgit v1.2.3