wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11671 from nextcloud/refactor/rename-admin-security-section

Browse source 
Rename admin security section
This commit is contained in:
Morris Jobke 2018-10-08 13:57:38 +02:00 committed by GitHub
commit bae3ba3b25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/composer/composer/autoload_classmap.php
View file

@ -976,9 +976,9 @@ return array(
'OC\\Settings\\Activity\\SecurityProvider' => $baseDir . '/settings/Activity/SecurityProvider.php',
'OC\\Settings\\Activity\\SecuritySetting' => $baseDir . '/settings/Activity/SecuritySetting.php',
'OC\\Settings\\Activity\\Setting' => $baseDir . '/settings/Activity/Setting.php',
'OC\\Settings\\Admin\\Encryption' => $baseDir . '/lib/private/Settings/Admin/Encryption.php',
'OC\\Settings\\Admin\\Mail' => $baseDir . '/lib/private/Settings/Admin/Mail.php',
'OC\\Settings\\Admin\\Overview' => $baseDir . '/lib/private/Settings/Admin/Overview.php',
'OC\\Settings\\Admin\\Security' => $baseDir . '/lib/private/Settings/Admin/Security.php',
'OC\\Settings\\Admin\\Server' => $baseDir . '/lib/private/Settings/Admin/Server.php',
'OC\\Settings\\Admin\\Sharing' => $baseDir . '/lib/private/Settings/Admin/Sharing.php',
'OC\\Settings\\Application' => $baseDir . '/settings/Application.php',

2
lib/composer/composer/autoload_static.php
View file

@ -1006,9 +1006,9 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Settings\\Activity\\SecurityProvider' => __DIR__ . '/../../..' . '/settings/Activity/SecurityProvider.php',
'OC\\Settings\\Activity\\SecuritySetting' => __DIR__ . '/../../..' . '/settings/Activity/SecuritySetting.php',
'OC\\Settings\\Activity\\Setting' => __DIR__ . '/../../..' . '/settings/Activity/Setting.php',
'OC\\Settings\\Admin\\Encryption' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Encryption.php',
'OC\\Settings\\Admin\\Mail' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Mail.php',
'OC\\Settings\\Admin\\Overview' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Overview.php',
'OC\\Settings\\Admin\\Security' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Security.php',
'OC\\Settings\\Admin\\Server' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Server.php',
'OC\\Settings\\Admin\\Sharing' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Sharing.php',
'OC\\Settings\\Application' => __DIR__ . '/../../..' . '/settings/Application.php',

4
lib/private/Settings/Admin/Encryption.php → lib/private/Settings/Admin/Security.php
View file

@ -30,7 +30,7 @@ use OCP\Encryption\IManager;
use OCP\IUserManager;
use OCP\Settings\ISettings;
class Encryption implements ISettings {
class Security implements ISettings {
/** @var IManager */
private $manager;
@ -70,7 +70,7 @@ class Encryption implements ISettings {
'encryptionModules' => $encryptionModuleList,
];
return new TemplateResponse('settings', 'settings/admin/encryption', $parameters, '');
return new TemplateResponse('settings', 'settings/admin/security', $parameters, '');
}
/**

2
lib/private/Settings/Manager.php
View file

@ -234,7 +234,7 @@ class Manager implements IManager {
}
if ($section === 'security') {
/** @var ISettings $form */
$form = $this->container->query(Admin\Encryption::class);
$form = $this->container->query(Admin\Security::class);
$forms[$form->getPriority()] = [$form];
}
if ($section === 'sharing') {

0
settings/templates/settings/admin/encryption.php → settings/templates/settings/admin/security.php
View file

12
tests/lib/Settings/Admin/EncryptionTest.php → tests/lib/Settings/Admin/SecurityTest.php
View file

@ -24,13 +24,13 @@
namespace Test\Settings\Admin;
use OC\Encryption\Manager;
use OC\Settings\Admin\Encryption;
use OC\Settings\Admin\Security;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IUserManager;
use Test\TestCase;
class EncryptionTest extends TestCase {
/** @var Encryption */
class SecurityTest extends TestCase {
/** @var Security */
private $admin;
/** @var Manager */
private $manager;
@ -42,7 +42,7 @@ class EncryptionTest extends TestCase {
$this->manager = $this->getMockBuilder('\OC\Encryption\Manager')->disableOriginalConstructor()->getMock();
$this->userManager = $this->getMockBuilder(IUserManager::class)->getMock();
$this->admin = new Encryption(
$this->admin = new Security(
$this->manager,
$this->userManager
);
@ -81,7 +81,7 @@ class EncryptionTest extends TestCase {
->willReturn(['entry']);
$expected = new TemplateResponse(
'settings',
'settings/admin/encryption',
'settings/admin/security',
[
'encryptionEnabled' => $enabled,
'encryptionReady' => $enabled,
@ -116,7 +116,7 @@ class EncryptionTest extends TestCase {
->willReturn(['entry', 'entry']);
$expected = new TemplateResponse(
'settings',
'settings/admin/encryption',
'settings/admin/security',
[
'encryptionEnabled' => $enabled,
'encryptionReady' => $enabled,