Merge pull request #15471 from nextcloud/backport/15468/stable16

[stable16] Remove recommendation for opcache on CLI
nextcloud · May 9, 2019 · a1236d0 · a1236d0
2 parents 02d82df + 14537a0
commit a1236d0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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;
 		}