diff options
author | Maxence Lange <maxence@artificial-owl.com> | 2024-11-12 21:29:18 -0100 |
---|---|---|
committer | Maxence Lange <maxence@artificial-owl.com> | 2024-11-18 20:11:31 -0100 |
commit | 6afc8552b7c0dcd96c88533f47bc8b55cba327c9 (patch) | |
tree | 44bb0b891743ecbd8f5827233d7f6b0a0e18ae9c | |
parent | 7c04818c5c078fb1dc7c5b79f295fc40a60a6296 (diff) | |
download | nextcloud-server-6afc8552b7c0dcd96c88533f47bc8b55cba327c9.tar.gz nextcloud-server-6afc8552b7c0dcd96c88533f47bc8b55cba327c9.zip |
feat(user-prefs): switching to NCU/
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-rw-r--r-- | lib/composer/composer/autoload_classmap.php | 10 | ||||
-rw-r--r-- | lib/composer/composer/autoload_static.php | 10 | ||||
-rw-r--r-- | lib/private/AllConfig.php | 6 | ||||
-rw-r--r-- | lib/private/Config/UserPreferences.php | 10 | ||||
-rw-r--r-- | lib/private/Server.php | 2 | ||||
-rw-r--r-- | lib/unstable/Config/Exceptions/IncorrectTypeException.php (renamed from lib/public/Config/Exceptions/IncorrectTypeException.php) | 2 | ||||
-rw-r--r-- | lib/unstable/Config/Exceptions/TypeConflictException.php (renamed from lib/public/Config/Exceptions/TypeConflictException.php) | 2 | ||||
-rw-r--r-- | lib/unstable/Config/Exceptions/UnknownKeyException.php (renamed from lib/public/Config/Exceptions/UnknownKeyException.php) | 2 | ||||
-rw-r--r-- | lib/unstable/Config/IUserPreferences.php (renamed from lib/public/Config/IUserPreferences.php) | 6 | ||||
-rw-r--r-- | lib/unstable/Config/ValueType.php (renamed from lib/public/Config/ValueType.php) | 4 | ||||
-rw-r--r-- | tests/lib/UserPreferencesTest.php | 8 |
11 files changed, 31 insertions, 31 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index c3abaefd56c..7ba1e0e4667 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -7,6 +7,11 @@ $baseDir = dirname(dirname($vendorDir)); return array( 'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php', + 'NCU\\Config\\Exceptions\\IncorrectTypeException' => $baseDir . '/lib/unstable/Config/Exceptions/IncorrectTypeException.php', + 'NCU\\Config\\Exceptions\\TypeConflictException' => $baseDir . '/lib/unstable/Config/Exceptions/TypeConflictException.php', + 'NCU\\Config\\Exceptions\\UnknownKeyException' => $baseDir . '/lib/unstable/Config/Exceptions/UnknownKeyException.php', + 'NCU\\Config\\IUserPreferences' => $baseDir . '/lib/unstable/Config/IUserPreferences.php', + 'NCU\\Config\\ValueType' => $baseDir . '/lib/unstable/Config/ValueType.php', 'OCP\\Accounts\\IAccount' => $baseDir . '/lib/public/Accounts/IAccount.php', 'OCP\\Accounts\\IAccountManager' => $baseDir . '/lib/public/Accounts/IAccountManager.php', 'OCP\\Accounts\\IAccountProperty' => $baseDir . '/lib/public/Accounts/IAccountProperty.php', @@ -223,11 +228,6 @@ return array( 'OCP\\Common\\Exception\\NotFoundException' => $baseDir . '/lib/public/Common/Exception/NotFoundException.php', 'OCP\\Config\\BeforePreferenceDeletedEvent' => $baseDir . '/lib/public/Config/BeforePreferenceDeletedEvent.php', 'OCP\\Config\\BeforePreferenceSetEvent' => $baseDir . '/lib/public/Config/BeforePreferenceSetEvent.php', - 'OCP\\Config\\Exceptions\\IncorrectTypeException' => $baseDir . '/lib/public/Config/Exceptions/IncorrectTypeException.php', - 'OCP\\Config\\Exceptions\\TypeConflictException' => $baseDir . '/lib/public/Config/Exceptions/TypeConflictException.php', - 'OCP\\Config\\Exceptions\\UnknownKeyException' => $baseDir . '/lib/public/Config/Exceptions/UnknownKeyException.php', - 'OCP\\Config\\IUserPreferences' => $baseDir . '/lib/public/Config/IUserPreferences.php', - 'OCP\\Config\\ValueType' => $baseDir . '/lib/public/Config/ValueType.php', 'OCP\\Console\\ConsoleEvent' => $baseDir . '/lib/public/Console/ConsoleEvent.php', 'OCP\\Console\\ReservedOptions' => $baseDir . '/lib/public/Console/ReservedOptions.php', 'OCP\\Constants' => $baseDir . '/lib/public/Constants.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index cf821ddeba0..cf1d395fd43 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -48,6 +48,11 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 public static $classMap = array ( 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', + 'NCU\\Config\\Exceptions\\IncorrectTypeException' => __DIR__ . '/../../..' . '/lib/unstable/Config/Exceptions/IncorrectTypeException.php', + 'NCU\\Config\\Exceptions\\TypeConflictException' => __DIR__ . '/../../..' . '/lib/unstable/Config/Exceptions/TypeConflictException.php', + 'NCU\\Config\\Exceptions\\UnknownKeyException' => __DIR__ . '/../../..' . '/lib/unstable/Config/Exceptions/UnknownKeyException.php', + 'NCU\\Config\\IUserPreferences' => __DIR__ . '/../../..' . '/lib/unstable/Config/IUserPreferences.php', + 'NCU\\Config\\ValueType' => __DIR__ . '/../../..' . '/lib/unstable/Config/ValueType.php', 'OCP\\Accounts\\IAccount' => __DIR__ . '/../../..' . '/lib/public/Accounts/IAccount.php', 'OCP\\Accounts\\IAccountManager' => __DIR__ . '/../../..' . '/lib/public/Accounts/IAccountManager.php', 'OCP\\Accounts\\IAccountProperty' => __DIR__ . '/../../..' . '/lib/public/Accounts/IAccountProperty.php', @@ -264,11 +269,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\Common\\Exception\\NotFoundException' => __DIR__ . '/../../..' . '/lib/public/Common/Exception/NotFoundException.php', 'OCP\\Config\\BeforePreferenceDeletedEvent' => __DIR__ . '/../../..' . '/lib/public/Config/BeforePreferenceDeletedEvent.php', 'OCP\\Config\\BeforePreferenceSetEvent' => __DIR__ . '/../../..' . '/lib/public/Config/BeforePreferenceSetEvent.php', - 'OCP\\Config\\Exceptions\\IncorrectTypeException' => __DIR__ . '/../../..' . '/lib/public/Config/Exceptions/IncorrectTypeException.php', - 'OCP\\Config\\Exceptions\\TypeConflictException' => __DIR__ . '/../../..' . '/lib/public/Config/Exceptions/TypeConflictException.php', - 'OCP\\Config\\Exceptions\\UnknownKeyException' => __DIR__ . '/../../..' . '/lib/public/Config/Exceptions/UnknownKeyException.php', - 'OCP\\Config\\IUserPreferences' => __DIR__ . '/../../..' . '/lib/public/Config/IUserPreferences.php', - 'OCP\\Config\\ValueType' => __DIR__ . '/../../..' . '/lib/public/Config/ValueType.php', 'OCP\\Console\\ConsoleEvent' => __DIR__ . '/../../..' . '/lib/public/Console/ConsoleEvent.php', 'OCP\\Console\\ReservedOptions' => __DIR__ . '/../../..' . '/lib/public/Console/ReservedOptions.php', 'OCP\\Constants' => __DIR__ . '/../../..' . '/lib/public/Constants.php', diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php index 8f7e5359c96..dbea65fdc21 100644 --- a/lib/private/AllConfig.php +++ b/lib/private/AllConfig.php @@ -6,11 +6,11 @@ */ namespace OC; +use NCU\Config\Exceptions\TypeConflictException; +use NCU\Config\IUserPreferences; +use NCU\Config\ValueType; use OC\Config\UserPreferences; use OCP\Cache\CappedMemoryCache; -use OCP\Config\Exceptions\TypeConflictException; -use OCP\Config\IUserPreferences; -use OCP\Config\ValueType; use OCP\IConfig; use OCP\IDBConnection; use OCP\PreConditionNotMetException; diff --git a/lib/private/Config/UserPreferences.php b/lib/private/Config/UserPreferences.php index 6dd9c633836..d9fd5f6a064 100644 --- a/lib/private/Config/UserPreferences.php +++ b/lib/private/Config/UserPreferences.php @@ -11,11 +11,11 @@ namespace OC\Config; use Generator; use InvalidArgumentException; use JsonException; -use OCP\Config\Exceptions\IncorrectTypeException; -use OCP\Config\Exceptions\TypeConflictException; -use OCP\Config\Exceptions\UnknownKeyException; -use OCP\Config\IUserPreferences; -use OCP\Config\ValueType; +use NCU\Config\Exceptions\IncorrectTypeException; +use NCU\Config\Exceptions\TypeConflictException; +use NCU\Config\Exceptions\UnknownKeyException; +use NCU\Config\IUserPreferences; +use NCU\Config\ValueType; use OCP\DB\Exception as DBException; use OCP\DB\IResult; use OCP\DB\QueryBuilder\IQueryBuilder; diff --git a/lib/private/Server.php b/lib/private/Server.php index e109636f1fa..dc4b3c4f7dc 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -7,6 +7,7 @@ namespace OC; use bantu\IniGetWrapper\IniGetWrapper; +use NCU\Config\IUserPreferences; use OC\Accounts\AccountManager; use OC\App\AppManager; use OC\App\AppStore\Bundles\BundleFetcher; @@ -138,7 +139,6 @@ use OCP\Collaboration\AutoComplete\IManager; use OCP\Collaboration\Reference\IReferenceManager; use OCP\Command\IBus; use OCP\Comments\ICommentsManager; -use OCP\Config\IUserPreferences; use OCP\Contacts\ContactsMenu\IActionFactory; use OCP\Contacts\ContactsMenu\IContactsStore; use OCP\Defaults; diff --git a/lib/public/Config/Exceptions/IncorrectTypeException.php b/lib/unstable/Config/Exceptions/IncorrectTypeException.php index dafbbacff78..b3eedde5300 100644 --- a/lib/public/Config/Exceptions/IncorrectTypeException.php +++ b/lib/unstable/Config/Exceptions/IncorrectTypeException.php @@ -6,7 +6,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCP\Config\Exceptions; +namespace NCU\Config\Exceptions; use Exception; diff --git a/lib/public/Config/Exceptions/TypeConflictException.php b/lib/unstable/Config/Exceptions/TypeConflictException.php index 0b3c903cb38..042991f8a57 100644 --- a/lib/public/Config/Exceptions/TypeConflictException.php +++ b/lib/unstable/Config/Exceptions/TypeConflictException.php @@ -6,7 +6,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCP\Config\Exceptions; +namespace NCU\Config\Exceptions; use Exception; diff --git a/lib/public/Config/Exceptions/UnknownKeyException.php b/lib/unstable/Config/Exceptions/UnknownKeyException.php index 2150246f1d2..80626c6a635 100644 --- a/lib/public/Config/Exceptions/UnknownKeyException.php +++ b/lib/unstable/Config/Exceptions/UnknownKeyException.php @@ -6,7 +6,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCP\Config\Exceptions; +namespace NCU\Config\Exceptions; use Exception; diff --git a/lib/public/Config/IUserPreferences.php b/lib/unstable/Config/IUserPreferences.php index 18c7fdcd665..a2695a0d053 100644 --- a/lib/public/Config/IUserPreferences.php +++ b/lib/unstable/Config/IUserPreferences.php @@ -6,11 +6,11 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCP\Config; +namespace NCU\Config; use Generator; -use OCP\Config\Exceptions\IncorrectTypeException; -use OCP\Config\Exceptions\UnknownKeyException; +use NCU\Config\Exceptions\IncorrectTypeException; +use NCU\Config\Exceptions\UnknownKeyException; /** * This class provides an easy way for apps to store user preferences in the diff --git a/lib/public/Config/ValueType.php b/lib/unstable/Config/ValueType.php index caf510046c2..2c3c5851e3f 100644 --- a/lib/public/Config/ValueType.php +++ b/lib/unstable/Config/ValueType.php @@ -6,9 +6,9 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCP\Config; +namespace NCU\Config; -use OCP\Config\Exceptions\IncorrectTypeException; +use NCU\Config\Exceptions\IncorrectTypeException; use UnhandledMatchError; /** diff --git a/tests/lib/UserPreferencesTest.php b/tests/lib/UserPreferencesTest.php index 19e6d6161bf..c149af002d3 100644 --- a/tests/lib/UserPreferencesTest.php +++ b/tests/lib/UserPreferencesTest.php @@ -7,11 +7,11 @@ declare(strict_types=1); */ namespace lib; +use NCU\Config\Exceptions\TypeConflictException; +use NCU\Config\Exceptions\UnknownKeyException; +use NCU\Config\IUserPreferences; +use NCU\Config\ValueType; use OC\Config\UserPreferences; -use OCP\Config\Exceptions\TypeConflictException; -use OCP\Config\Exceptions\UnknownKeyException; -use OCP\Config\IUserPreferences; -use OCP\Config\ValueType; use OCP\IDBConnection; use OCP\Security\ICrypto; use Psr\Log\LoggerInterface; |