Merge pull request #12547 from nextcloud/fix/ocp-server-getters

ChristophWurst · web-flow · commit 329472a5b4fe · 2026-03-11T13:52:42.000+01:00
fix: replace deprecated and removed OC\Server getters
diff --git a/lib/Service/HtmlPurify/TransformURLScheme.php b/lib/Service/HtmlPurify/TransformURLScheme.php
@@ -121,7 +121,7 @@ private function filterHttpFtp(&$uri, $context) {
 			null, $this->request->getServerHost(),
 			null,
 			$this->urlGenerator->linkToRoute('mail.proxy.proxy'),
-			'src=' . $originalURL . '&requesttoken=' . \OC::$server->getSession()->get('requesttoken'),
+			'src=' . $originalURL . '&requesttoken=' . \OCP\Server::get(\OCP\ISession::class)->get('requesttoken'),
 			null
 		);
 	}
diff --git a/tests/Integration/Db/AliasMapperTest.php b/tests/Integration/Db/AliasMapperTest.php
@@ -11,7 +11,6 @@
 
 use ChristophWurst\Nextcloud\Testing\DatabaseTransaction;
 use ChristophWurst\Nextcloud\Testing\TestCase;
-use OC;
 use OCA\Mail\Db\Alias;
 use OCA\Mail\Db\AliasMapper;
 use OCA\Mail\Db\MailAccount;
@@ -38,7 +37,7 @@ class AliasMapperTest extends TestCase {
 	 */
 	public function setup(): void {
 		parent::setUp();
-		$this->db = OC::$server->getDatabaseConnection();
+		$this->db = \OCP\Server::get(\OCP\IDBConnection::class);
 		$this->mapper = new AliasMapper($this->db);
 	}
 
diff --git a/tests/Integration/Db/CollectedAddressMapperTest.php b/tests/Integration/Db/CollectedAddressMapperTest.php
@@ -10,7 +10,6 @@
 
 use ChristophWurst\Nextcloud\Testing\DatabaseTransaction;
 use ChristophWurst\Nextcloud\Testing\TestCase;
-use OC;
 use OCA\Mail\Db\CollectedAddress;
 use OCA\Mail\Db\CollectedAddressMapper;
 use OCP\IDBConnection;
@@ -42,7 +41,7 @@ class CollectedAddressMapperTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->db = OC::$server->getDatabaseConnection();
+		$this->db = \OCP\Server::get(\OCP\IDBConnection::class);
 		$this->mapper = new CollectedAddressMapper($this->db);
 
 		// Empty DB
diff --git a/tests/Integration/Db/LocalAttachmentMapperTest.php b/tests/Integration/Db/LocalAttachmentMapperTest.php
@@ -53,7 +53,7 @@ class LocalAttachmentMapperTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->db = \OC::$server->getDatabaseConnection();
+		$this->db = \OCP\Server::get(\OCP\IDBConnection::class);
 		$this->mapper = new LocalAttachmentMapper(
 			$this->db
 		);
diff --git a/tests/Integration/Db/LocalMessageMapperTest.php b/tests/Integration/Db/LocalMessageMapperTest.php
@@ -45,7 +45,7 @@ class LocalMessageMapperTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->db = \OC::$server->getDatabaseConnection();
+		$this->db = \OCP\Server::get(\OCP\IDBConnection::class);
 		$recipientMapper = new RecipientMapper(
 			$this->db
 		);
diff --git a/tests/Integration/Db/MailAccountMapperTest.php b/tests/Integration/Db/MailAccountMapperTest.php
@@ -12,7 +12,6 @@
 
 use ChristophWurst\Nextcloud\Testing\DatabaseTransaction;
 use ChristophWurst\Nextcloud\Testing\TestCase;
-use OC;
 use OCA\Mail\Db\MailAccount;
 use OCA\Mail\Db\MailAccountMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -40,7 +39,7 @@ class MailAccountMapperTest extends TestCase {
 	 */
 	public function setup(): void {
 		parent::setUp();
-		$this->db = OC::$server->getDatabaseConnection();
+		$this->db = \OCP\Server::get(\OCP\IDBConnection::class);
 		$this->mapper = new MailAccountMapper($this->db);
 
 		$this->account = new MailAccount();
diff --git a/tests/Integration/Db/MailboxMapperTest.php b/tests/Integration/Db/MailboxMapperTest.php
@@ -34,7 +34,7 @@ class MailboxMapperTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->db = \OC::$server->getDatabaseConnection();
+		$this->db = \OCP\Server::get(\OCP\IDBConnection::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->mapper = new MailboxMapper(
 			$this->db,
diff --git a/tests/Integration/Db/MessageMapperTest.php b/tests/Integration/Db/MessageMapperTest.php
@@ -41,7 +41,7 @@ class MessageMapperTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->db = \OC::$server->getDatabaseConnection();
+		$this->db = \OCP\Server::get(\OCP\IDBConnection::class);
 		$this->time = $this->createMock(ITimeFactory::class);
 		$this->time->method('getTime')->willReturnCallback(fn () => $this->timestamp);
 		$tagMapper = $this->createMock(TagMapper::class);
diff --git a/tests/Integration/Db/ProvisioningMapperTest.php b/tests/Integration/Db/ProvisioningMapperTest.php
@@ -11,7 +11,6 @@
 
 use ChristophWurst\Nextcloud\Testing\DatabaseTransaction;
 use ChristophWurst\Nextcloud\Testing\TestCase;
-use OC;
 use OCA\Mail\Db\Provisioning;
 use OCA\Mail\Db\ProvisioningMapper;
 use OCA\Mail\Exception\ValidationException;
@@ -44,7 +43,7 @@ class ProvisioningMapperTest extends TestCase {
 	 */
 	public function setup(): void {
 		parent::setUp();
-		$this->db = OC::$server->getDatabaseConnection();
+		$this->db = \OCP\Server::get(\OCP\IDBConnection::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->mapper = new ProvisioningMapper($this->db, $this->logger);
 
diff --git a/tests/Integration/Db/RecipientMapperTest.php b/tests/Integration/Db/RecipientMapperTest.php
@@ -48,7 +48,7 @@ class RecipientMapperTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->db = \OC::$server->getDatabaseConnection();
+		$this->db = \OCP\Server::get(\OCP\IDBConnection::class);
 		$this->mapper = new RecipientMapper(
 			$this->db
 		);
diff --git a/tests/Integration/Framework/ImapTestAccount.php b/tests/Integration/Framework/ImapTestAccount.php
@@ -7,7 +7,6 @@
 
 namespace OCA\Mail\Tests\Integration\Framework;
 
-use OC;
 use OCA\Mail\Account;
 use OCA\Mail\Db\MailAccount;
 use OCA\Mail\IMAP\MailboxSync;
@@ -40,12 +39,12 @@ public function createTestAccount(?string $userId = null) {
 		$mailAccount->setInboundPort(993);
 		$mailAccount->setInboundSslMode('ssl');
 		$mailAccount->setInboundUser('user@domain.tld');
-		$mailAccount->setInboundPassword(OC::$server->getCrypto()->encrypt('mypassword'));
+		$mailAccount->setInboundPassword(\OCP\Server::get(\OCP\Security\ICrypto::class)->encrypt('mypassword'));
 
 		$mailAccount->setOutboundHost('127.0.0.1');
 		$mailAccount->setOutboundPort(25);
 		$mailAccount->setOutboundUser('user@domain.tld');
-		$mailAccount->setOutboundPassword(OC::$server->getCrypto()->encrypt('mypassword'));
+		$mailAccount->setOutboundPassword(\OCP\Server::get(\OCP\Security\ICrypto::class)->encrypt('mypassword'));
 		$mailAccount->setOutboundSslMode('none');
 		$mailAccount->setDebug(false);
 		$acc = $accountService->save($mailAccount);
diff --git a/tests/Integration/Service/MailTransmissionIntegrationTest.php b/tests/Integration/Service/MailTransmissionIntegrationTest.php
@@ -76,7 +76,7 @@ protected function setUp(): void {
 		$this->user = $this->createTestUser();
 
 		/** @var ICrypto $crypo */
-		$crypo = OC::$server->getCrypto();
+		$crypo = \OCP\Server::get(\OCP\Security\ICrypto::class);
 		/** @var MailAccountMapper $mapper */
 		$mapper = Server::get(MailAccountMapper::class);
 		$mailAccount = MailAccount::fromParams([
diff --git a/tests/Integration/Service/Phishing/PhishingDetectionServiceIntegrationTest.php b/tests/Integration/Service/Phishing/PhishingDetectionServiceIntegrationTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void {
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->contactCheck = new ContactCheck($this->contactsIntegration, $this->l10n);
 		$this->customEmailCheck = new CustomEmailCheck($this->l10n);
-		$this->dateCheck = new DateCheck($this->l10n, \OC::$server->get(ITimeFactory::class));
+		$this->dateCheck = new DateCheck($this->l10n, \OCP\Server::get(ITimeFactory::class));
 		$this->replyToCheck = new ReplyToCheck($this->l10n);
 		$this->linkCheck = new LinkCheck($this->l10n);
 		$this->imapFlagCheck = new ImapFlagCheck($this->l10n);
diff --git a/tests/Unit/Service/HtmlTest.php b/tests/Unit/Service/HtmlTest.php
@@ -11,7 +11,6 @@
 namespace OCA\Mail\Tests\Unit\Service;
 
 use ChristophWurst\Nextcloud\Testing\TestCase;
-use OC;
 use OCA\Mail\Service\Html;
 use OCP\IRequest;
 use OCP\IURLGenerator;
@@ -62,8 +61,8 @@ public function linkDetectionProvider() {
 	 * @param $text
 	 */
 	public function testParseMailBody($expectedBody, $expectedSignature, $text) {
-		$urlGenerator = OC::$server->getURLGenerator();
-		$request = OC::$server->getRequest();
+		$urlGenerator = \OCP\Server::get(\OCP\IURLGenerator::class);
+		$request = \OCP\Server::get(\OCP\IRequest::class);
 		$html = new Html($urlGenerator, $request);
 		[$b, $s] = $html->parseMailBody($text);
 		$this->assertSame($expectedBody, $b);
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
@@ -493,6 +493,13 @@
       <code><![CDATA[$value]]></code>
     </PossiblyUndefinedArrayOffset>
   </file>
+  <file src="lib/Service/HtmlPurify/TransformURLScheme.php">
+    <NullArgument>
+      <code><![CDATA[null]]></code>
+      <code><![CDATA[null]]></code>
+      <code><![CDATA[null]]></code>
+    </NullArgument>
+  </file>
   <file src="lib/Service/IMipService.php">
     <PossiblyNullArgument>
       <code><![CDATA[$sender]]></code>
diff --git a/vendor-bin/phpunit/composer.json b/vendor-bin/phpunit/composer.json
@@ -6,6 +6,6 @@
 		"sort-packages": true
 	},
 	"require-dev": {
-		"christophwurst/nextcloud_testing": "^1.1.1"
+		"christophwurst/nextcloud_testing": "^1.1.3"
 	}
 }
diff --git a/vendor-bin/phpunit/composer.lock b/vendor-bin/phpunit/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private function filterHttpFtp(&$uri, $context) {`
`121`	`121`	`null, $this->request->getServerHost(),`
`122`	`122`	`null,`
`123`	`123`	`$this->urlGenerator->linkToRoute('mail.proxy.proxy'),`
`124`		`- 'src=' . $originalURL . '&requesttoken=' . \OC::$server->getSession()->get('requesttoken'),`
	`124`	`+ 'src=' . $originalURL . '&requesttoken=' . \OCP\Server::get(\OCP\ISession::class)->get('requesttoken'),`
`125`	`125`	`null`
`126`	`126`	`);`
`127`	`127`	`}`