diff options
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 2 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 2 | ||||
| -rw-r--r-- | lib/private/Settings/Admin/Security.php (renamed from lib/private/Settings/Admin/Encryption.php) | 2 | ||||
| -rw-r--r-- | lib/private/Settings/Manager.php | 2 | ||||
| -rw-r--r-- | tests/lib/Settings/Admin/SecurityTest.php (renamed from tests/lib/Settings/Admin/EncryptionTest.php) | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 4e8a523fada..0223cafd1d4 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 34c530aa1e8..4b853936887 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 index 65f507154ad..8475e3d8995 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 48883582ef4..036f1ed594f 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 index 9be2a3f46d9..4ad98227297 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 ); |