Remove recommendation for opcache on CLI

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 03f109c872590bfc2c8f802af8e13fb52271e299..514494ab59c850b0d26668ca1e75787ca14550dd 100644 (file)
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -332,7 +332,7 @@
                                                                {
                                                                        docLink: data.phpOpcacheDocumentation,
                                                                }
-                                                       ) + "<pre><code>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</code></pre>",
+                                                       ) + "<pre><code>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</code></pre>",
                                                        type: OC.SetupChecks.MESSAGE_TYPE_INFO
                                                });
                                        }

diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 8ef574f54d38d061252b7ec64d3a12d1a14e309f..dbca5429727311fe38313629cb6d93347edb3c3d 100644 (file)
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -789,7 +789,7 @@ describe('OC.SetupChecks tests', function() {
 
                        async.done(function( data, s, x ){
                                expect(data).toEqual([{
-                                               msg: 'The PHP OPcache is not properly configured. <a href="https://example.org/link/to/doc" rel="noreferrer noopener">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:' + "<pre><code>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</code></pre>",
+                                               msg: 'The PHP OPcache is not properly configured. <a href="https://example.org/link/to/doc" rel="noreferrer noopener">For better performance it is recommended</a> to use the following settings in the <code>php.ini</code>:' + "<pre><code>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</code></pre>",
                                                type: OC.SetupChecks.MESSAGE_TYPE_INFO
                                        }]);
                                done();

diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 70dfadd196f84f2e40bf6cc6201fda58d835558e..718feb16f7a6b1215a3d4e2a1cb0b39fe8466d68 100644 (file)
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -412,10 +412,6 @@ Raw output
                        return false;
                }
 
-               if(!$iniWrapper->getBool('opcache.enable_cli')) {
-                       return false;
-               }
-
                if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
                        return false;
                }