From 98bd325b51eb6ff505b6aebc9ef8d50d830c9447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 15 Jul 2022 14:35:23 +0200 Subject: [PATCH 1/2] Add public NoUserException MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/composer/composer/autoload_classmap.php | 1 + lib/composer/composer/autoload_static.php | 1 + lib/private/User/NoUserException.php | 3 +- lib/public/User/NoUserException.php | 32 +++++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 lib/public/User/NoUserException.php diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 8c485fe53d9df..a754d412833e2 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -616,6 +616,7 @@ 'OCP\\User\\Events\\UserLoggedInWithCookieEvent' => $baseDir . '/lib/public/User/Events/UserLoggedInWithCookieEvent.php', 'OCP\\User\\Events\\UserLoggedOutEvent' => $baseDir . '/lib/public/User/Events/UserLoggedOutEvent.php', 'OCP\\User\\GetQuotaEvent' => $baseDir . '/lib/public/User/GetQuotaEvent.php', + 'OCP\\User\\NoUserException' => $baseDir . '/lib/public/User/NoUserException.php', 'OCP\\Util' => $baseDir . '/lib/public/Util.php', 'OCP\\WorkflowEngine\\EntityContext\\IContextPortation' => $baseDir . '/lib/public/WorkflowEngine/EntityContext/IContextPortation.php', 'OCP\\WorkflowEngine\\EntityContext\\IDisplayName' => $baseDir . '/lib/public/WorkflowEngine/EntityContext/IDisplayName.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 0dd18e5ddbf1e..ec96aba1f6306 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -649,6 +649,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\User\\Events\\UserLoggedInWithCookieEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserLoggedInWithCookieEvent.php', 'OCP\\User\\Events\\UserLoggedOutEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserLoggedOutEvent.php', 'OCP\\User\\GetQuotaEvent' => __DIR__ . '/../../..' . '/lib/public/User/GetQuotaEvent.php', + 'OCP\\User\\NoUserException' => __DIR__ . '/../../..' . '/lib/public/User/NoUserException.php', 'OCP\\Util' => __DIR__ . '/../../..' . '/lib/public/Util.php', 'OCP\\WorkflowEngine\\EntityContext\\IContextPortation' => __DIR__ . '/../../..' . '/lib/public/WorkflowEngine/EntityContext/IContextPortation.php', 'OCP\\WorkflowEngine\\EntityContext\\IDisplayName' => __DIR__ . '/../../..' . '/lib/public/WorkflowEngine/EntityContext/IDisplayName.php', diff --git a/lib/private/User/NoUserException.php b/lib/private/User/NoUserException.php index d914931846765..e7f69627d1c79 100644 --- a/lib/private/User/NoUserException.php +++ b/lib/private/User/NoUserException.php @@ -22,5 +22,6 @@ */ namespace OC\User; -class NoUserException extends \Exception { +/** @depreacted 25.0.0 */ +class NoUserException extends \OCP\User\NoUserException { } diff --git a/lib/public/User/NoUserException.php b/lib/public/User/NoUserException.php new file mode 100644 index 0000000000000..d7a8cc96dfab3 --- /dev/null +++ b/lib/public/User/NoUserException.php @@ -0,0 +1,32 @@ + + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ +namespace OCP\User; + +/** + * @since 25.0.0 + */ +class NoUserException extends \Exception { +} From cdd4db36b21f1e75d2b2008eaf6b12bb8c929d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 15 Jul 2022 14:47:17 +0200 Subject: [PATCH 2/2] Move usages to OCP\User\NoUserException MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/dashboard/lib/Service/BackgroundService.php | 4 ++-- apps/dav/lib/BackgroundJob/EventReminderJob.php | 2 +- apps/dav/lib/BackgroundJob/UploadCleanup.php | 2 +- apps/encryption/lib/Hooks/UserHooks.php | 2 +- apps/files/lib/Service/OwnershipTransferService.php | 2 +- apps/files_external/lib/Command/Create.php | 2 +- apps/files_external/lib/Command/Import.php | 2 +- apps/files_external/lib/Command/ListCommand.php | 2 +- apps/files_sharing/lib/SharedStorage.php | 2 +- apps/files_trashbin/lib/Trashbin.php | 2 +- apps/files_versions/lib/Sabre/VersionHome.php | 2 +- apps/files_versions/lib/Storage.php | 4 ++-- apps/files_versions/tests/VersioningTest.php | 2 +- apps/provisioning_api/lib/Controller/AUserData.php | 2 +- .../tests/Controller/GroupsControllerTest.php | 2 +- apps/sharebymail/lib/ShareByMailProvider.php | 2 +- apps/testing/lib/Controller/LockingController.php | 2 +- apps/user_ldap/lib/User_LDAP.php | 4 ++-- lib/private/Avatar/AvatarManager.php | 2 +- lib/private/Cache/File.php | 2 +- lib/private/Encryption/Keys/Storage.php | 2 +- lib/private/Files/Filesystem.php | 4 ++-- lib/private/Files/Node/Root.php | 4 ++-- lib/private/Files/Template/TemplateManager.php | 2 +- lib/private/Files/View.php | 2 +- lib/private/User/Session.php | 2 +- lib/public/Files/IRootFolder.php | 2 +- tests/lib/Files/FilesystemTest.php | 8 ++++---- tests/lib/Files/Node/RootTest.php | 2 +- 29 files changed, 37 insertions(+), 37 deletions(-) diff --git a/apps/dashboard/lib/Service/BackgroundService.php b/apps/dashboard/lib/Service/BackgroundService.php index c98b92412cbb5..454a8464d046a 100644 --- a/apps/dashboard/lib/Service/BackgroundService.php +++ b/apps/dashboard/lib/Service/BackgroundService.php @@ -27,7 +27,7 @@ namespace OCA\Dashboard\Service; use InvalidArgumentException; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCP\Files\File; use OCP\Files\IAppData; use OCP\Files\IRootFolder; @@ -143,7 +143,7 @@ public function setDefaultBackground(): void { * @throws NotPermittedException * @throws LockedException * @throws PreConditionNotMetException - * @throws NoUserException + * @throws \OCP\User\NoUserException */ public function setFileBackground($path): void { $this->config->setUserValue($this->userId, 'dashboard', 'background', 'custom'); diff --git a/apps/dav/lib/BackgroundJob/EventReminderJob.php b/apps/dav/lib/BackgroundJob/EventReminderJob.php index 55cecf5519d52..bbade00667ff7 100644 --- a/apps/dav/lib/BackgroundJob/EventReminderJob.php +++ b/apps/dav/lib/BackgroundJob/EventReminderJob.php @@ -54,7 +54,7 @@ public function __construct(ITimeFactory $time, /** * @throws \OCA\DAV\CalDAV\Reminder\NotificationProvider\ProviderNotAvailableException * @throws \OCA\DAV\CalDAV\Reminder\NotificationTypeDoesNotExistException - * @throws \OC\User\NoUserException + * @throws \OCP\User\NoUserException */ public function run($argument):void { if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') { diff --git a/apps/dav/lib/BackgroundJob/UploadCleanup.php b/apps/dav/lib/BackgroundJob/UploadCleanup.php index 3a6f296deafa1..dce657fca6649 100644 --- a/apps/dav/lib/BackgroundJob/UploadCleanup.php +++ b/apps/dav/lib/BackgroundJob/UploadCleanup.php @@ -27,7 +27,7 @@ */ namespace OCA\DAV\BackgroundJob; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJob; use OCP\BackgroundJob\IJobList; diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php index a719d7bc12e1f..98a548fec6928 100644 --- a/apps/encryption/lib/Hooks/UserHooks.php +++ b/apps/encryption/lib/Hooks/UserHooks.php @@ -329,7 +329,7 @@ public function setPassphrase($params) { * init mount points for given user * * @param string $user - * @throws \OC\User\NoUserException + * @throws \OCP\User\NoUserException */ protected function initMountPoints($user) { Filesystem::initMountPoints($user); diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php index 661a7e66e1039..a4ce17bb8264a 100644 --- a/apps/files/lib/Service/OwnershipTransferService.php +++ b/apps/files/lib/Service/OwnershipTransferService.php @@ -93,7 +93,7 @@ public function __construct(IEncryptionManager $manager, * @param OutputInterface|null $output * @param bool $move * @throws TransferOwnershipException - * @throws \OC\User\NoUserException + * @throws \OCP\User\NoUserException */ public function transfer(IUser $sourceUser, IUser $destinationUser, diff --git a/apps/files_external/lib/Command/Create.php b/apps/files_external/lib/Command/Create.php index 99991b893cdab..6b2125a7134ea 100644 --- a/apps/files_external/lib/Command/Create.php +++ b/apps/files_external/lib/Command/Create.php @@ -26,7 +26,7 @@ use OC\Core\Command\Base; use OC\Files\Filesystem; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\DefinitionParameter; diff --git a/apps/files_external/lib/Command/Import.php b/apps/files_external/lib/Command/Import.php index 53ae0d7c5bf88..66c49bc0f36cd 100644 --- a/apps/files_external/lib/Command/Import.php +++ b/apps/files_external/lib/Command/Import.php @@ -25,7 +25,7 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\GlobalStoragesService; diff --git a/apps/files_external/lib/Command/ListCommand.php b/apps/files_external/lib/Command/ListCommand.php index fadf5d8de2749..a3cdc920a3873 100644 --- a/apps/files_external/lib/Command/ListCommand.php +++ b/apps/files_external/lib/Command/ListCommand.php @@ -26,7 +26,7 @@ namespace OCA\Files_External\Command; use OC\Core\Command\Base; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Service\UserStoragesService; diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 60a292c498d67..fd675c96e8d0d 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -44,7 +44,7 @@ use OCP\Files\Node; use OC\Files\Storage\FailedStorage; use OC\Files\Storage\Wrapper\PermissionsMask; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCA\Files_External\Config\ExternalMountPoint; use OCP\Constants; use OCP\Files\Cache\ICacheEntry; diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 975e9fd2557fd..9719f8fa5ffbd 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -95,7 +95,7 @@ public static function ensureFileScannedHook($params) { * * @param string $filename * @return array - * @throws \OC\User\NoUserException + * @throws \OCP\User\NoUserException */ public static function getUidAndFilename($filename) { $uid = Filesystem::getOwner($filename); diff --git a/apps/files_versions/lib/Sabre/VersionHome.php b/apps/files_versions/lib/Sabre/VersionHome.php index 13505d9a96c49..a82c6b4aafd82 100644 --- a/apps/files_versions/lib/Sabre/VersionHome.php +++ b/apps/files_versions/lib/Sabre/VersionHome.php @@ -23,7 +23,7 @@ */ namespace OCA\Files_Versions\Sabre; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCA\Files_Versions\Versions\IVersionManager; use OCP\Files\IRootFolder; use OCP\IUserManager; diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index 3f91e32ef954a..1f8b8e8b6a62f 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -105,7 +105,7 @@ class Storage { * * @param string $filename * @return array - * @throws \OC\User\NoUserException + * @throws \OCP\User\NoUserException */ public static function getUidAndFilename($filename) { $uid = Filesystem::getOwner($filename); @@ -755,7 +755,7 @@ public static function expire($filename, $uid) { $user = \OC::$server->get(IUserManager::class)->get($uid); if (is_null($user)) { $logger->error('Backends provided no user object for ' . $uid, ['app' => 'files_versions']); - throw new \OC\User\NoUserException('Backends provided no user object for ' . $uid); + throw new \OCP\User\NoUserException('Backends provided no user object for ' . $uid); } \OC_Util::setupFS($uid); diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php index 952298b3ef9d9..19e9b98ff9b3c 100644 --- a/apps/files_versions/tests/VersioningTest.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -629,7 +629,7 @@ public function testExpireNonexistingFile() { public function testExpireNonexistingUser() { - $this->expectException(\OC\User\NoUserException::class); + $this->expectException(\OCP\User\NoUserException::class); $this->logout(); // needed to have a FS setup (the background job does this) diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php index f2fbea7b04f90..98aa71c8d3b6c 100644 --- a/apps/provisioning_api/lib/Controller/AUserData.php +++ b/apps/provisioning_api/lib/Controller/AUserData.php @@ -33,7 +33,7 @@ use OC\Group\Manager; use OC\User\Backend; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OC_Helper; use OCP\Accounts\IAccountManager; use OCP\Accounts\PropertyDoesNotExistException; diff --git a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php index 1201099556074..e1741663f25de 100644 --- a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php +++ b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php @@ -31,7 +31,7 @@ use OC\Group\Manager; use OC\SubAdmin; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCA\Provisioning_API\Controller\GroupsController; use OCP\Accounts\IAccountManager; use OCP\IConfig; diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 01dd3b428d179..1ed7f4a6a3687 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -42,7 +42,7 @@ use OC\Share20\Exception\InvalidShare; use OC\Share20\Share; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCA\ShareByMail\Settings\SettingsManager; use OCP\Activity\IManager; use OCP\DB\QueryBuilder\IQueryBuilder; diff --git a/apps/testing/lib/Controller/LockingController.php b/apps/testing/lib/Controller/LockingController.php index c01ad218c84f6..1d9d6042819fb 100644 --- a/apps/testing/lib/Controller/LockingController.php +++ b/apps/testing/lib/Controller/LockingController.php @@ -23,7 +23,7 @@ namespace OCA\Testing\Controller; use OC\Lock\DBLockingProvider; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCA\Testing\Locking\FakeDBLockingProvider; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index 5a44510005262..0fe72772b01bc 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -40,7 +40,7 @@ use OC\ServerNotAvailableException; use OC\User\Backend; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCA\User_LDAP\Exceptions\NotOnLDAP; use OCA\User_LDAP\User\OfflineUser; use OCA\User_LDAP\User\User; @@ -429,7 +429,7 @@ public function deleteUser($uid) { * * @param string $uid the username * @return bool|string - * @throws NoUserException + * @throws \OCP\User\NoUserException * @throws \Exception */ public function getHome($uid) { diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php index ec9bed4085089..4a84e9b7fb7bb 100644 --- a/lib/private/Avatar/AvatarManager.php +++ b/lib/private/Avatar/AvatarManager.php @@ -37,7 +37,7 @@ use OC\KnownUser\KnownUserService; use OC\User\Manager; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCP\Accounts\IAccountManager; use OCP\Accounts\PropertyDoesNotExistException; use OCP\Files\IAppData; diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php index 8e192b2233290..2ceab51ce9c81 100644 --- a/lib/private/Cache/File.php +++ b/lib/private/Cache/File.php @@ -45,7 +45,7 @@ class File implements ICache { * * @return \OC\Files\View cache storage * @throws \OC\ForbiddenException - * @throws \OC\User\NoUserException + * @throws \OCP\User\NoUserException */ protected function getStorage() { if ($this->storage !== null) { diff --git a/lib/private/Encryption/Keys/Storage.php b/lib/private/Encryption/Keys/Storage.php index a3772af5878e0..087a34c6569be 100644 --- a/lib/private/Encryption/Keys/Storage.php +++ b/lib/private/Encryption/Keys/Storage.php @@ -31,7 +31,7 @@ use OC\Files\Filesystem; use OC\Files\View; use OC\ServerNotAvailableException; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCP\Encryption\Keys\IStorage; use OCP\IConfig; use OCP\Security\ICrypto; diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 9542666b03cca..1c67ec43b1218 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -39,7 +39,7 @@ use OCP\Cache\CappedMemoryCache; use OC\Files\Mount\MountPoint; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Events\Node\FilesystemTornDownEvent; use OCP\Files\NotFoundException; @@ -366,7 +366,7 @@ public static function initMountManager() { * Initialize system and personal mount points for a user * * @param string|IUser|null $user - * @throws \OC\User\NoUserException if the user is not available + * @throws \OCP\User\NoUserException if the user is not available */ public static function initMountPoints($user = '') { /** @var IUserManager $userManager */ diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php index ca930c1002c0f..db606d4a92ae0 100644 --- a/lib/private/Files/Node/Root.php +++ b/lib/private/Files/Node/Root.php @@ -39,7 +39,7 @@ use OC\Files\Utils\PathHelper; use OC\Files\View; use OC\Hooks\PublicEmitter; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Config\IUserMountCache; use OCP\Files\Events\Node\FilesystemTornDownEvent; @@ -358,7 +358,7 @@ public function getName() { * * @param string $userId user ID * @return \OCP\Files\Folder - * @throws NoUserException + * @throws \OCP\User\NoUserException * @throws NotPermittedException */ public function getUserFolder($userId) { diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php index dde224e5eadb1..9d17b7d8b41eb 100644 --- a/lib/private/Files/Template/TemplateManager.php +++ b/lib/private/Files/Template/TemplateManager.php @@ -186,7 +186,7 @@ public function createFromTemplate(string $filePath, string $templateId = '', st * @return Folder * @throws \OCP\Files\NotFoundException * @throws \OCP\Files\NotPermittedException - * @throws \OC\User\NoUserException + * @throws \OCP\User\NoUserException */ private function getTemplateFolder(): Node { if ($this->getTemplatePath() !== '') { diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index e5394e72ffee7..eec4c9895f55a 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -2155,7 +2155,7 @@ public function getPathRelativeToFiles($absolutePath) { /** * @param string $filename * @return array - * @throws \OC\User\NoUserException + * @throws \OCP\User\NoUserException * @throws NotFoundException */ public function getUidAndFilename($filename) { diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index 65a213d4bf808..1b15371b8ab34 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -322,7 +322,7 @@ public function setImpersonatingUserID(bool $useCurrentUser = true): void { $currentUser = $this->getUser(); if ($currentUser === null) { - throw new \OC\User\NoUserException(); + throw new \OCP\User\NoUserException(); } $this->session->set('oldUserId', $currentUser->getUID()); } diff --git a/lib/public/Files/IRootFolder.php b/lib/public/Files/IRootFolder.php index 7d007cb690cdb..849d3cf6cd7bf 100644 --- a/lib/public/Files/IRootFolder.php +++ b/lib/public/Files/IRootFolder.php @@ -25,7 +25,7 @@ namespace OCP\Files; use OC\Hooks\Emitter; -use OC\User\NoUserException; +use OCP\User\NoUserException; /** * Interface IRootFolder diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php index 8f34860d85a12..e40d5b35447df 100644 --- a/tests/lib/Files/FilesystemTest.php +++ b/tests/lib/Files/FilesystemTest.php @@ -24,7 +24,7 @@ use OC\Files\Mount\MountPoint; use OC\Files\Storage\Temporary; -use OC\User\NoUserException; +use OCP\User\NoUserException; use OCP\Files\Config\IMountProvider; use OCP\Files\Storage\IStorageFactory; use OCP\IUser; @@ -340,16 +340,16 @@ public function testHooks() { * */ public function testLocalMountWhenUserDoesNotExist() { - $this->expectException(\OC\User\NoUserException::class); + $this->expectException(\OCP\User\NoUserException::class); $userId = $this->getUniqueID('user_'); \OC\Files\Filesystem::initMountPoints($userId); } - + public function testNullUserThrows() { - $this->expectException(\OC\User\NoUserException::class); + $this->expectException(\OCP\User\NoUserException::class); \OC\Files\Filesystem::initMountPoints(null); } diff --git a/tests/lib/Files/Node/RootTest.php b/tests/lib/Files/Node/RootTest.php index 5d8e2a4ac62e3..d7da55ea761dd 100644 --- a/tests/lib/Files/Node/RootTest.php +++ b/tests/lib/Files/Node/RootTest.php @@ -210,7 +210,7 @@ public function testGetUserFolder() { public function testGetUserFolderWithNoUserObj() { - $this->expectException(\OC\User\NoUserException::class); + $this->expectException(\OCP\User\NoUserException::class); $this->expectExceptionMessage('Backends provided no user object'); $root = new \OC\Files\Node\Root(