2 files changed, 13 insertions, 13 deletions
diff --git a/tests/lib/Collaboration/Resources/ManagerTest.php b/tests/lib/Collaboration/Resources/ManagerTest.php
index 4ca88da8678..0e4e42458e2 100644
--- a/tests/lib/Collaboration/Resources/ManagerTest.php
+++ b/tests/lib/Collaboration/Resources/ManagerTest.php
@@ -12,16 +12,15 @@ use OC\Collaboration\Resources\Manager;
 use OCP\Collaboration\Resources\IManager;
 use OCP\Collaboration\Resources\IProviderManager;
 use OCP\IDBConnection;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class ManagerTest extends TestCase {
-	/** @var LoggerInterface */
-	protected $logger;
-	/** @var IProviderManager */
-	protected $providerManager;
-	/** @var IManager */
-	protected $manager;
+
+	protected LoggerInterface&MockObject $logger;
+	protected IProviderManager&MockObject $providerManager;
+	protected IManager $manager;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/tests/lib/Collaboration/Resources/ProviderManagerTest.php b/tests/lib/Collaboration/Resources/ProviderManagerTest.php
index 01c201e0a4e..b063d89f06e 100644
--- a/tests/lib/Collaboration/Resources/ProviderManagerTest.php
+++ b/tests/lib/Collaboration/Resources/ProviderManagerTest.php
@@ -77,13 +77,14 @@ class ProviderManagerTest extends TestCase {
 	public function testGetResourceProvidersValidAndInvalidProvider(): void {
 		$this->serverContainer->expects($this->exactly(2))
 			->method('query')
-			->withConsecutive(
-				[$this->equalTo('InvalidResourceProvider')],
-				[$this->equalTo(ResourceProvider::class)],
-			)->willReturnOnConsecutiveCalls(
-				$this->throwException(new QueryException('A meaningful error message')),
-				$this->createMock(ResourceProvider::class),
-			);
+			->willReturnCallback(function (string $service) {
+				if ($service === 'InvalidResourceProvider') {
+					throw new QueryException('A meaningful error message');
+				}
+				if ($service === ResourceProvider::class) {
+					return $this->createMock(ResourceProvider::class);
+				}
+			});
 
 		$this->logger->expects($this->once())
 			->method('error');