upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #31267 from nextcloud/enh/docs-link-for-opcache-recommends

Browse source 
Add Nextcloud docs link to OPcache recommends
This commit is contained in:
MichaIng 2022-03-04 01:24:10 +01:00 committed by GitHub
commit 3980322621
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/settings/lib/Controller/CheckSetupController.php
View file

@ -469,7 +469,7 @@ Raw output
protected function getOpcacheSetupRecommendations(): array {
// If the module is not loaded, return directly to skip inapplicable checks
if (!extension_loaded('Zend OPcache')) {
return ['The PHP OPcache module is not loaded. <a target="_blank" rel="noreferrer noopener" class="external" href="' . $this->urlGenerator->linkToDocs('admin-php-opcache') . '">For better performance it is recommended</a> to load it into your PHP installation.'];
return ['The PHP OPcache module is not loaded. For better performance it is recommended to load it into your PHP installation.'];
}
$recommendations = [];

3
apps/settings/tests/Controller/CheckSetupControllerTest.php
View file

@ -582,9 +582,6 @@ class CheckSetupControllerTest extends TestCase {
if ($key === 'admin-code-integrity') {
return 'http://docs.example.org/server/go.php?to=admin-code-integrity';
}
if ($key === 'admin-php-opcache') {
return 'http://docs.example.org/server/go.php?to=admin-php-opcache';
}
if ($key === 'admin-db-conversion') {
return 'http://docs.example.org/server/go.php?to=admin-db-conversion';
}

7
core/js/setupchecks.js
View file

@ -342,10 +342,9 @@
listOfOPcacheRecommendations += "<li>" + element + "</li>";
});
messages.push({
msg: t(
'core',
'The PHP OPcache module is not properly configured:'
) + "<ul>" + listOfOPcacheRecommendations + "</ul>",
msg: t('core', 'The PHP OPcache module is not properly configured. See the {linkstart}documentation ↗{linkend} for more information.')
.replace('{linkstart}', '<a target="_blank" rel="noreferrer noopener" class="external" href="' + OC.theme.docPlaceholderUrl.replace('PLACEHOLDER', 'admin-php-opcache') + '">')
.replace('{linkend}', '</a>') + '<ul>' + listOfOPcacheRecommendations + '</ul>',
type: OC.SetupChecks.MESSAGE_TYPE_INFO
});
}

5
core/js/tests/specs/setupchecksSpec.js
View file

@ -522,7 +522,6 @@ describe('OC.SetupChecks tests', function() {
isCorrectMemcachedPHPModuleInstalled: true,
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
phpOpcacheDocumentation: 'https://example.org/link/to/doc',
isSettimelimitAvailable: true,
hasFreeTypeSupport: true,
missingIndexes: [],
@ -876,7 +875,6 @@ describe('OC.SetupChecks tests', function() {
isCorrectMemcachedPHPModuleInstalled: true,
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: ['recommendation1', 'recommendation2'],
phpOpcacheDocumentation: 'https://example.org/link/to/doc',
isSettimelimitAvailable: true,
hasFreeTypeSupport: true,
missingIndexes: [],
@ -900,7 +898,7 @@ describe('OC.SetupChecks tests', function() {
async.done(function( data, s, x ){
expect(data).toEqual([{
msg: 'The PHP OPcache module is not properly configured:<ul><li>recommendation1</li><li>recommendation2</li></ul>',
msg: 'The PHP OPcache module is not properly configured. See the <a target="_blank" rel="noreferrer noopener" class="external" href="https://docs.example.org/admin-php-opcache">documentation ↗</a> for more information.<ul><li>recommendation1</li><li>recommendation2</li></ul>',
type: OC.SetupChecks.MESSAGE_TYPE_INFO
}]);
done();
@ -932,7 +930,6 @@ describe('OC.SetupChecks tests', function() {
isCorrectMemcachedPHPModuleInstalled: true,
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
phpOpcacheDocumentation: 'https://example.org/link/to/doc',
isSettimelimitAvailable: true,
hasFreeTypeSupport: false,
missingIndexes: [],