1 files changed, 16 insertions, 15 deletions

diff --git a/apps/files_sharing/tests/SharesReminderJobTest.php b/apps/files_sharing/tests/SharesReminderJobTest.php
index d68a9d30182..ce468e279ec 100644
--- a/apps/files_sharing/tests/SharesReminderJobTest.php
+++ b/apps/files_sharing/tests/SharesReminderJobTest.php
@@ -20,6 +20,7 @@ use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Mail\IMailer;
 use OCP\Mail\IMessage;
+use OCP\Server;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -44,9 +45,9 @@ class SharesReminderJobTest extends \Test\TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->db = \OC::$server->get(IDBConnection::class);
-		$this->shareManager = \OC::$server->get(IManager::class);
-		$this->userManager = \OC::$server->get(IUserManager::class);
+		$this->db = Server::get(IDBConnection::class);
+		$this->shareManager = Server::get(IManager::class);
+		$this->userManager = Server::get(IUserManager::class);
 		$this->mailer = $this->createMock(IMailer::class);
 
 		// Clear occasional leftover shares from other tests
@@ -60,26 +61,26 @@ class SharesReminderJobTest extends \Test\TestCase {
 		$user1->setSystemEMailAddress('user1@test.com');
 		$user2->setSystemEMailAddress('user2@test.com');
 
-		\OC::registerShareHooks(\OC::$server->get(SystemConfig::class));
+		\OC::registerShareHooks(Server::get(SystemConfig::class));
 
 		$this->job = new SharesReminderJob(
-			\OC::$server->get(ITimeFactory::class),
+			Server::get(ITimeFactory::class),
 			$this->db,
-			\OC::$server->get(IManager::class),
+			Server::get(IManager::class),
 			$this->userManager,
-			\OC::$server->get(LoggerInterface::class),
-			\OC::$server->get(IURLGenerator::class),
-			\OC::$server->get(IFactory::class),
+			Server::get(LoggerInterface::class),
+			Server::get(IURLGenerator::class),
+			Server::get(IFactory::class),
 			$this->mailer,
-			\OC::$server->get(Defaults::class),
-			\OC::$server->get(IMimeTypeLoader::class),
+			Server::get(Defaults::class),
+			Server::get(IMimeTypeLoader::class),
 		);
 	}
 
 	protected function tearDown(): void {
 		$this->db->executeUpdate('DELETE FROM `*PREFIX*share`');
 
-		$userManager = \OC::$server->get(IUserManager::class);
+		$userManager = Server::get(IUserManager::class);
 		$user1 = $userManager->get($this->user1);
 		if ($user1) {
 			$user1->delete();
@@ -94,7 +95,7 @@ class SharesReminderJobTest extends \Test\TestCase {
 		parent::tearDown();
 	}
 
-	public function dataSharesReminder() {
+	public static function dataSharesReminder() {
 		$someMail = 'test@test.com';
 		$noExpirationDate = null;
 		$today = new \DateTime();
@@ -143,7 +144,6 @@ class SharesReminderJobTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider dataSharesReminder
 	 *
 	 * @param \DateTime|null $expirationDate Share expiration date
 	 * @param string $email Share with this email. If empty, the share is of type TYPE_USER and the sharee is user2
@@ -151,12 +151,13 @@ class SharesReminderJobTest extends \Test\TestCase {
 	 * @param int $permissions
 	 * @param bool $shouldBeReminded
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSharesReminder')]
 	public function testSharesReminder(
 		?\DateTime $expirationDate, string $email, bool $isEmpty, int $permissions, bool $shouldBeReminded,
 	): void {
 		$this->loginAsUser($this->user1);
 
-		$user1Folder = \OC::$server->get(IRootFolder::class)->getUserFolder($this->user1);
+		$user1Folder = Server::get(IRootFolder::class)->getUserFolder($this->user1);
 		$testFolder = $user1Folder->newFolder('test');
 
 		if (!$isEmpty) {