From 5d2fdfe0b5214bd35bc9842cb6aa53f70aff125d Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 8 Oct 2018 10:22:27 +0200 Subject: [PATCH 1/3] Rename admin security section Signed-off-by: Christoph Wurst --- lib/composer/composer/autoload_classmap.php | 2 +- lib/composer/composer/autoload_static.php | 2 +- .../Settings/Admin/{Encryption.php => Security.php} | 2 +- lib/private/Settings/Manager.php | 2 +- .../Admin/{EncryptionTest.php => SecurityTest.php} | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) rename lib/private/Settings/Admin/{Encryption.php => Security.php} (98%) rename tests/lib/Settings/Admin/{EncryptionTest.php => SecurityTest.php} (96%) diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 4e8a523fad..0223cafd1d 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -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', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 34c530aa1e..4b85393688 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -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', diff --git a/lib/private/Settings/Admin/Encryption.php b/lib/private/Settings/Admin/Security.php similarity index 98% rename from lib/private/Settings/Admin/Encryption.php rename to lib/private/Settings/Admin/Security.php index 65f507154a..8475e3d899 100644 --- a/lib/private/Settings/Admin/Encryption.php +++ b/lib/private/Settings/Admin/Security.php @@ -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; diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 48883582ef..036f1ed594 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -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') { diff --git a/tests/lib/Settings/Admin/EncryptionTest.php b/tests/lib/Settings/Admin/SecurityTest.php similarity index 96% rename from tests/lib/Settings/Admin/EncryptionTest.php rename to tests/lib/Settings/Admin/SecurityTest.php index 9be2a3f46d..4ad9822729 100644 --- a/tests/lib/Settings/Admin/EncryptionTest.php +++ b/tests/lib/Settings/Admin/SecurityTest.php @@ -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 ); From f29189f2006cbc2a6a188a616483151b6b971881 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 8 Oct 2018 10:45:28 +0200 Subject: [PATCH 2/3] Rename admin security settings template Signed-off-by: Christoph Wurst --- lib/private/Settings/Admin/Security.php | 2 +- .../templates/settings/admin/{encryption.php => security.php} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename settings/templates/settings/admin/{encryption.php => security.php} (100%) diff --git a/lib/private/Settings/Admin/Security.php b/lib/private/Settings/Admin/Security.php index 8475e3d899..dd80d4d3ae 100644 --- a/lib/private/Settings/Admin/Security.php +++ b/lib/private/Settings/Admin/Security.php @@ -70,7 +70,7 @@ class Security implements ISettings { 'encryptionModules' => $encryptionModuleList, ]; - return new TemplateResponse('settings', 'settings/admin/encryption', $parameters, ''); + return new TemplateResponse('settings', 'settings/admin/security', $parameters, ''); } /** diff --git a/settings/templates/settings/admin/encryption.php b/settings/templates/settings/admin/security.php similarity index 100% rename from settings/templates/settings/admin/encryption.php rename to settings/templates/settings/admin/security.php From b1b43aa7bc3c4d5ffe4973cf12644c1e60305530 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 8 Oct 2018 11:27:22 +0200 Subject: [PATCH 3/3] Fix reference to template in tests Signed-off-by: Christoph Wurst --- tests/lib/Settings/Admin/SecurityTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/lib/Settings/Admin/SecurityTest.php b/tests/lib/Settings/Admin/SecurityTest.php index 4ad9822729..a7c56f697b 100644 --- a/tests/lib/Settings/Admin/SecurityTest.php +++ b/tests/lib/Settings/Admin/SecurityTest.php @@ -81,7 +81,7 @@ class SecurityTest extends TestCase { ->willReturn(['entry']); $expected = new TemplateResponse( 'settings', - 'settings/admin/encryption', + 'settings/admin/security', [ 'encryptionEnabled' => $enabled, 'encryptionReady' => $enabled, @@ -116,7 +116,7 @@ class SecurityTest extends TestCase { ->willReturn(['entry', 'entry']); $expected = new TemplateResponse( 'settings', - 'settings/admin/encryption', + 'settings/admin/security', [ 'encryptionEnabled' => $enabled, 'encryptionReady' => $enabled,