From c8f2198aa0247229579d7a4fc1ecdb33ef79842c Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 9 May 2019 12:25:53 +0200
Subject: [PATCH] Remove recommendation for opcache on CLI
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
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 b290bddadf4..2e4901a10c5 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -320,7 +320,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 0603ac72281..b5248add984 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. <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 f1da8406edb..f760eefacb6 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -413,10 +413,6 @@ Raw output
return false;
}
- if(!$iniWrapper->getBool('opcache.enable_cli')) {
- return false;
- }
-
if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
return false;
}
--
GitLab