diff --git a/apps/settings/tests/Settings/Admin/SharingTest.php b/apps/settings/tests/Settings/Admin/SharingTest.php index 5fcc153b6dd..2309628868c 100644 --- a/apps/settings/tests/Settings/Admin/SharingTest.php +++ b/apps/settings/tests/Settings/Admin/SharingTest.php @@ -5,6 +5,7 @@ */ namespace OCA\Settings\Tests\Settings\Admin; +use OC\Share20\Manager; use OCA\Settings\Settings\Admin\Sharing; use OCP\App\IAppManager; use OCP\AppFramework\Http\TemplateResponse; @@ -13,7 +14,6 @@ use OCP\Constants; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; -use OCP\Share\IManager; use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; @@ -24,7 +24,7 @@ class SharingTest extends TestCase { private $config; /** @var IL10N&MockObject */ private $l10n; - /** @var IManager|MockObject */ + /** @var Manager|MockObject */ private $shareManager; /** @var IAppManager|MockObject */ private $appManager; @@ -38,8 +38,8 @@ class SharingTest extends TestCase { $this->config = $this->getMockBuilder(IConfig::class)->getMock(); $this->l10n = $this->getMockBuilder(IL10N::class)->getMock(); - /** @var IManager|MockObject */ - $this->shareManager = $this->getMockBuilder(IManager::class)->getMock(); + /** @var Manager|MockObject */ + $this->shareManager = $this->createMock(Manager::class); /** @var IAppManager|MockObject */ $this->appManager = $this->getMockBuilder(IAppManager::class)->getMock(); /** @var IURLGenerator|MockObject */ diff --git a/tests/lib/Collaboration/Collaborators/UserPluginTest.php b/tests/lib/Collaboration/Collaborators/UserPluginTest.php index 453f16c6686..35071ca96f9 100644 --- a/tests/lib/Collaboration/Collaborators/UserPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/UserPluginTest.php @@ -456,6 +456,10 @@ class UserPluginTest extends TestCase { ->method('getUser') ->willReturn($this->user); + $this->userManager->expects($this->any()) + ->method('searchDisplayName') + ->willReturn($userResponse); + if (!$shareWithGroupOnly) { if ($shareeEnumerationPhone) { $this->userManager->expects($this->once()) @@ -766,10 +770,10 @@ class UserPluginTest extends TestCase { ->willReturnCallback(function ($search) use ($matchingUsers) { $users = array_filter( $matchingUsers, - fn ($user) => str_contains(strtolower($user['displayName']), strtolower($search)) + fn ($user) => str_contains(strtolower($user['displayName'] ?? $user['uid']), strtolower($search)) ); return array_map( - fn ($user) => $this->getUserMock($user['uid'], $user['displayName']), + fn ($user) => $this->getUserMock($user['uid'], $user['displayName'] ?? $user['uid']), $users); });