Skip to content

Commit cdd4db3

Browse files
juliusknorrcome-nc
authored andcommitted
Move usages to OCP\User\NoUserException
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent 98bd325 commit cdd4db3

File tree

29 files changed

+37
-37
lines changed

29 files changed

+37
-37
lines changed

apps/dashboard/lib/Service/BackgroundService.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
namespace OCA\Dashboard\Service;
2828

2929
use InvalidArgumentException;
30-
use OC\User\NoUserException;
30+
use OCP\User\NoUserException;
3131
use OCP\Files\File;
3232
use OCP\Files\IAppData;
3333
use OCP\Files\IRootFolder;
@@ -143,7 +143,7 @@ public function setDefaultBackground(): void {
143143
* @throws NotPermittedException
144144
* @throws LockedException
145145
* @throws PreConditionNotMetException
146-
* @throws NoUserException
146+
* @throws \OCP\User\NoUserException
147147
*/
148148
public function setFileBackground($path): void {
149149
$this->config->setUserValue($this->userId, 'dashboard', 'background', 'custom');

apps/dav/lib/BackgroundJob/EventReminderJob.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function __construct(ITimeFactory $time,
5454
/**
5555
* @throws \OCA\DAV\CalDAV\Reminder\NotificationProvider\ProviderNotAvailableException
5656
* @throws \OCA\DAV\CalDAV\Reminder\NotificationTypeDoesNotExistException
57-
* @throws \OC\User\NoUserException
57+
* @throws \OCP\User\NoUserException
5858
*/
5959
public function run($argument):void {
6060
if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {

apps/dav/lib/BackgroundJob/UploadCleanup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
namespace OCA\DAV\BackgroundJob;
2929

30-
use OC\User\NoUserException;
30+
use OCP\User\NoUserException;
3131
use OCP\AppFramework\Utility\ITimeFactory;
3232
use OCP\BackgroundJob\IJob;
3333
use OCP\BackgroundJob\IJobList;

apps/encryption/lib/Hooks/UserHooks.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ public function setPassphrase($params) {
329329
* init mount points for given user
330330
*
331331
* @param string $user
332-
* @throws \OC\User\NoUserException
332+
* @throws \OCP\User\NoUserException
333333
*/
334334
protected function initMountPoints($user) {
335335
Filesystem::initMountPoints($user);

apps/files/lib/Service/OwnershipTransferService.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function __construct(IEncryptionManager $manager,
9393
* @param OutputInterface|null $output
9494
* @param bool $move
9595
* @throws TransferOwnershipException
96-
* @throws \OC\User\NoUserException
96+
* @throws \OCP\User\NoUserException
9797
*/
9898
public function transfer(IUser $sourceUser,
9999
IUser $destinationUser,

apps/files_external/lib/Command/Create.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
use OC\Core\Command\Base;
2828
use OC\Files\Filesystem;
29-
use OC\User\NoUserException;
29+
use OCP\User\NoUserException;
3030
use OCA\Files_External\Lib\Auth\AuthMechanism;
3131
use OCA\Files_External\Lib\Backend\Backend;
3232
use OCA\Files_External\Lib\DefinitionParameter;

apps/files_external/lib/Command/Import.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
namespace OCA\Files_External\Command;
2626

2727
use OC\Core\Command\Base;
28-
use OC\User\NoUserException;
28+
use OCP\User\NoUserException;
2929
use OCA\Files_External\Lib\StorageConfig;
3030
use OCA\Files_External\Service\BackendService;
3131
use OCA\Files_External\Service\GlobalStoragesService;

apps/files_external/lib/Command/ListCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
namespace OCA\Files_External\Command;
2727

2828
use OC\Core\Command\Base;
29-
use OC\User\NoUserException;
29+
use OCP\User\NoUserException;
3030
use OCA\Files_External\Lib\StorageConfig;
3131
use OCA\Files_External\Service\GlobalStoragesService;
3232
use OCA\Files_External\Service\UserStoragesService;

apps/files_sharing/lib/SharedStorage.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
use OCP\Files\Node;
4545
use OC\Files\Storage\FailedStorage;
4646
use OC\Files\Storage\Wrapper\PermissionsMask;
47-
use OC\User\NoUserException;
47+
use OCP\User\NoUserException;
4848
use OCA\Files_External\Config\ExternalMountPoint;
4949
use OCP\Constants;
5050
use OCP\Files\Cache\ICacheEntry;

apps/files_trashbin/lib/Trashbin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static function ensureFileScannedHook($params) {
9595
*
9696
* @param string $filename
9797
* @return array
98-
* @throws \OC\User\NoUserException
98+
* @throws \OCP\User\NoUserException
9999
*/
100100
public static function getUidAndFilename($filename) {
101101
$uid = Filesystem::getOwner($filename);

apps/files_versions/lib/Sabre/VersionHome.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
namespace OCA\Files_Versions\Sabre;
2525

26-
use OC\User\NoUserException;
26+
use OCP\User\NoUserException;
2727
use OCA\Files_Versions\Versions\IVersionManager;
2828
use OCP\Files\IRootFolder;
2929
use OCP\IUserManager;

apps/files_versions/lib/Storage.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class Storage {
105105
*
106106
* @param string $filename
107107
* @return array
108-
* @throws \OC\User\NoUserException
108+
* @throws \OCP\User\NoUserException
109109
*/
110110
public static function getUidAndFilename($filename) {
111111
$uid = Filesystem::getOwner($filename);
@@ -755,7 +755,7 @@ public static function expire($filename, $uid) {
755755
$user = \OC::$server->get(IUserManager::class)->get($uid);
756756
if (is_null($user)) {
757757
$logger->error('Backends provided no user object for ' . $uid, ['app' => 'files_versions']);
758-
throw new \OC\User\NoUserException('Backends provided no user object for ' . $uid);
758+
throw new \OCP\User\NoUserException('Backends provided no user object for ' . $uid);
759759
}
760760

761761
\OC_Util::setupFS($uid);

apps/files_versions/tests/VersioningTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ public function testExpireNonexistingFile() {
629629

630630

631631
public function testExpireNonexistingUser() {
632-
$this->expectException(\OC\User\NoUserException::class);
632+
$this->expectException(\OCP\User\NoUserException::class);
633633

634634
$this->logout();
635635
// needed to have a FS setup (the background job does this)

apps/provisioning_api/lib/Controller/AUserData.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
use OC\Group\Manager;
3535
use OC\User\Backend;
36-
use OC\User\NoUserException;
36+
use OCP\User\NoUserException;
3737
use OC_Helper;
3838
use OCP\Accounts\IAccountManager;
3939
use OCP\Accounts\PropertyDoesNotExistException;

apps/provisioning_api/tests/Controller/GroupsControllerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
use OC\Group\Manager;
3333
use OC\SubAdmin;
34-
use OC\User\NoUserException;
34+
use OCP\User\NoUserException;
3535
use OCA\Provisioning_API\Controller\GroupsController;
3636
use OCP\Accounts\IAccountManager;
3737
use OCP\IConfig;

apps/sharebymail/lib/ShareByMailProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
use OC\Share20\Exception\InvalidShare;
4444
use OC\Share20\Share;
45-
use OC\User\NoUserException;
45+
use OCP\User\NoUserException;
4646
use OCA\ShareByMail\Settings\SettingsManager;
4747
use OCP\Activity\IManager;
4848
use OCP\DB\QueryBuilder\IQueryBuilder;

apps/testing/lib/Controller/LockingController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace OCA\Testing\Controller;
2424

2525
use OC\Lock\DBLockingProvider;
26-
use OC\User\NoUserException;
26+
use OCP\User\NoUserException;
2727
use OCA\Testing\Locking\FakeDBLockingProvider;
2828
use OCP\AppFramework\Http;
2929
use OCP\AppFramework\Http\DataResponse;

apps/user_ldap/lib/User_LDAP.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
use OC\ServerNotAvailableException;
4242
use OC\User\Backend;
43-
use OC\User\NoUserException;
43+
use OCP\User\NoUserException;
4444
use OCA\User_LDAP\Exceptions\NotOnLDAP;
4545
use OCA\User_LDAP\User\OfflineUser;
4646
use OCA\User_LDAP\User\User;
@@ -429,7 +429,7 @@ public function deleteUser($uid) {
429429
*
430430
* @param string $uid the username
431431
* @return bool|string
432-
* @throws NoUserException
432+
* @throws \OCP\User\NoUserException
433433
* @throws \Exception
434434
*/
435435
public function getHome($uid) {

lib/private/Avatar/AvatarManager.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
use OC\KnownUser\KnownUserService;
3939
use OC\User\Manager;
40-
use OC\User\NoUserException;
40+
use OCP\User\NoUserException;
4141
use OCP\Accounts\IAccountManager;
4242
use OCP\Accounts\PropertyDoesNotExistException;
4343
use OCP\Files\IAppData;

lib/private/Cache/File.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class File implements ICache {
4545
*
4646
* @return \OC\Files\View cache storage
4747
* @throws \OC\ForbiddenException
48-
* @throws \OC\User\NoUserException
48+
* @throws \OCP\User\NoUserException
4949
*/
5050
protected function getStorage() {
5151
if ($this->storage !== null) {

lib/private/Encryption/Keys/Storage.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
use OC\Files\Filesystem;
3232
use OC\Files\View;
3333
use OC\ServerNotAvailableException;
34-
use OC\User\NoUserException;
34+
use OCP\User\NoUserException;
3535
use OCP\Encryption\Keys\IStorage;
3636
use OCP\IConfig;
3737
use OCP\Security\ICrypto;

lib/private/Files/Filesystem.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
use OCP\Cache\CappedMemoryCache;
4141
use OC\Files\Mount\MountPoint;
42-
use OC\User\NoUserException;
42+
use OCP\User\NoUserException;
4343
use OCP\EventDispatcher\IEventDispatcher;
4444
use OCP\Files\Events\Node\FilesystemTornDownEvent;
4545
use OCP\Files\NotFoundException;
@@ -366,7 +366,7 @@ public static function initMountManager() {
366366
* Initialize system and personal mount points for a user
367367
*
368368
* @param string|IUser|null $user
369-
* @throws \OC\User\NoUserException if the user is not available
369+
* @throws \OCP\User\NoUserException if the user is not available
370370
*/
371371
public static function initMountPoints($user = '') {
372372
/** @var IUserManager $userManager */

lib/private/Files/Node/Root.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
use OC\Files\Utils\PathHelper;
4040
use OC\Files\View;
4141
use OC\Hooks\PublicEmitter;
42-
use OC\User\NoUserException;
42+
use OCP\User\NoUserException;
4343
use OCP\EventDispatcher\IEventDispatcher;
4444
use OCP\Files\Config\IUserMountCache;
4545
use OCP\Files\Events\Node\FilesystemTornDownEvent;
@@ -358,7 +358,7 @@ public function getName() {
358358
*
359359
* @param string $userId user ID
360360
* @return \OCP\Files\Folder
361-
* @throws NoUserException
361+
* @throws \OCP\User\NoUserException
362362
* @throws NotPermittedException
363363
*/
364364
public function getUserFolder($userId) {

lib/private/Files/Template/TemplateManager.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public function createFromTemplate(string $filePath, string $templateId = '', st
186186
* @return Folder
187187
* @throws \OCP\Files\NotFoundException
188188
* @throws \OCP\Files\NotPermittedException
189-
* @throws \OC\User\NoUserException
189+
* @throws \OCP\User\NoUserException
190190
*/
191191
private function getTemplateFolder(): Node {
192192
if ($this->getTemplatePath() !== '') {

lib/private/Files/View.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2155,7 +2155,7 @@ public function getPathRelativeToFiles($absolutePath) {
21552155
/**
21562156
* @param string $filename
21572157
* @return array
2158-
* @throws \OC\User\NoUserException
2158+
* @throws \OCP\User\NoUserException
21592159
* @throws NotFoundException
21602160
*/
21612161
public function getUidAndFilename($filename) {

lib/private/User/Session.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public function setImpersonatingUserID(bool $useCurrentUser = true): void {
322322
$currentUser = $this->getUser();
323323

324324
if ($currentUser === null) {
325-
throw new \OC\User\NoUserException();
325+
throw new \OCP\User\NoUserException();
326326
}
327327
$this->session->set('oldUserId', $currentUser->getUID());
328328
}

lib/public/Files/IRootFolder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
namespace OCP\Files;
2626

2727
use OC\Hooks\Emitter;
28-
use OC\User\NoUserException;
28+
use OCP\User\NoUserException;
2929

3030
/**
3131
* Interface IRootFolder

tests/lib/Files/FilesystemTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
use OC\Files\Mount\MountPoint;
2626
use OC\Files\Storage\Temporary;
27-
use OC\User\NoUserException;
27+
use OCP\User\NoUserException;
2828
use OCP\Files\Config\IMountProvider;
2929
use OCP\Files\Storage\IStorageFactory;
3030
use OCP\IUser;
@@ -340,16 +340,16 @@ public function testHooks() {
340340
*
341341
*/
342342
public function testLocalMountWhenUserDoesNotExist() {
343-
$this->expectException(\OC\User\NoUserException::class);
343+
$this->expectException(\OCP\User\NoUserException::class);
344344

345345
$userId = $this->getUniqueID('user_');
346346

347347
\OC\Files\Filesystem::initMountPoints($userId);
348348
}
349349

350-
350+
351351
public function testNullUserThrows() {
352-
$this->expectException(\OC\User\NoUserException::class);
352+
$this->expectException(\OCP\User\NoUserException::class);
353353

354354
\OC\Files\Filesystem::initMountPoints(null);
355355
}

tests/lib/Files/Node/RootTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public function testGetUserFolder() {
210210

211211

212212
public function testGetUserFolderWithNoUserObj() {
213-
$this->expectException(\OC\User\NoUserException::class);
213+
$this->expectException(\OCP\User\NoUserException::class);
214214
$this->expectExceptionMessage('Backends provided no user object');
215215

216216
$root = new \OC\Files\Node\Root(

0 commit comments

Comments
 (0)