feat(user-prefs): switching to NCU/

Signed-off-by: Maxence Lange <[email protected]>
nextcloud · Nov 12, 2024 · 4141c8a · 4141c8a
1 parent 8ce060c
commit 4141c8a
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 31 deletions.
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
@@ -7,6 +7,11 @@
 
 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 @@
     '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
@@ -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
@@ -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
@@ -11,11 +11,11 @@
 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
@@ -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\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/...fig/Exceptions/IncorrectTypeException.php → ...fig/Exceptions/IncorrectTypeException.php b/...fig/Exceptions/IncorrectTypeException.php → ...fig/Exceptions/IncorrectTypeException.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCP\Config\Exceptions;
+namespace NCU\Config\Exceptions;
 
 use Exception;
 

diff --git a/...nfig/Exceptions/TypeConflictException.php → ...nfig/Exceptions/TypeConflictException.php b/...nfig/Exceptions/TypeConflictException.php → ...nfig/Exceptions/TypeConflictException.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCP\Config\Exceptions;
+namespace NCU\Config\Exceptions;
 
 use Exception;
 

diff --git a/...Config/Exceptions/UnknownKeyException.php → ...Config/Exceptions/UnknownKeyException.php b/...Config/Exceptions/UnknownKeyException.php → ...Config/Exceptions/UnknownKeyException.php
@@ -6,7 +6,7 @@
  * 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 → lib/unstable/Config/IUserPreferences.php b/lib/public/Config/IUserPreferences.php → lib/unstable/Config/IUserPreferences.php
@@ -6,11 +6,11 @@
  * 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 → lib/unstable/Config/ValueType.php b/lib/public/Config/ValueType.php → lib/unstable/Config/ValueType.php
@@ -6,9 +6,9 @@
  * 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
@@ -7,11 +7,11 @@
  */
 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;