refactor: Port away from deprecated code

lib/Command/PageTrashCleanup.php

@@ -9,13 +9,13 @@
 
 namespace OCA\Collectives\Command;
 
-use OC;
 use OCA\Collectives\Db\CollectiveMapper;
 use OCA\Collectives\Service\MissingDependencyException;
 use OCA\Collectives\Service\NotFoundException;
 use OCA\Collectives\Service\NotPermittedException;
 use OCA\Collectives\Trash\PageTrashBackend;
 use OCP\App\IAppManager;
+use OCP\Server;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
@@ -34,7 +34,7 @@ public function __construct(
 	) {
 		parent::__construct();
 		if ($appManager->isEnabledForUser('files_trashbin')) {
-			$this->trashBackend = OC::$server->get(PageTrashBackend::class);
+			$this->trashBackend = Server::get(PageTrashBackend::class);
 		}
 	}
 

lib/Model/PageInfo.php

@@ -14,6 +14,8 @@
 use OCP\Files\File;
 use OCP\Files\InvalidPathException;
 use OCP\Files\NotFoundException;
+use OCP\L10N\IFactory;
+use OCP\Server;
 
 class PageInfo implements JsonSerializable {
 	public const INDEX_PAGE_TITLE = 'Readme';
@@ -237,7 +239,7 @@ public function fromFile(
 		if (strcmp($file->getName(), self::INDEX_PAGE_TITLE . self::SUFFIX) === 0) {
 			if ($parentId === 0) {
 				// Landing page
-				$this->setTitle(\OC::$server->getL10N('collectives')->t('Landing page'));
+				$this->setTitle(Server::get(IFactory::class)->get('collectives')->t('Landing page'));
 			} else {
 				// Index page
 				$this->setTitle(basename($dirName));

lib/Mount/CollectiveFolderManager.php

@@ -30,6 +30,7 @@
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
+use OCP\Server;
 
 class CollectiveFolderManager {
 	private const SKELETON_DIR = 'skeleton';
@@ -89,8 +90,8 @@ public function getRootFolder(): Folder {
 	private function getCurrentUID(): ?string {
 		try {
 			// wopi requests are not logged in, instead we need to get the editor user from the access token
-			if (strpos($this->request->getRawPathInfo(), 'apps/richdocuments/wopi') && class_exists('OCA\Richdocuments\Db\WopiMapper')) {
-				$wopiMapper = OC::$server->query('OCA\Richdocuments\Db\WopiMapper');
+			if (strpos($this->request->getRawPathInfo(), 'apps/richdocuments/wopi') && class_exists(\OCA\Richdocuments\Db\WopiMapper::class)) {
+				$wopiMapper = Server::get(\OCA\Richdocuments\Db\WopiMapper::class);
 				$token = $this->request->getParam('access_token');
 				if ($token) {
 					return $wopiMapper->getPathForToken($token)->getEditorUid();
@@ -210,6 +211,22 @@ private function getSkeletonFolder(Folder $folder): Folder {
 	/**
 	 * @throws NotFoundException
 	 * @throws \OCP\DB\Exception
+	 * @return array{
+	 *     folder_id: int,
+	 *     fileid: int,
+	 *     storage: int,
+	 *     path: string,
+	 *     name: string,
+	 *     mimetype: string,
+	 *     mimepart: string,
+	 *     size: int|float,
+	 *     mtime: int,
+	 *     storage_mtime: int,
+	 *     etag: string,
+	 *     encrytped: bool,
+	 *     parent: int,
+	 *     permissions: int,
+	 * }
 	 */
 	public function getFolderFileCache(int $id, string $name): array {
 		$qb = $this->connection->getQueryBuilder();

lib/Mount/NoExcludePropagatorStorageWrapper.php

@@ -9,10 +9,11 @@
 
 namespace OCA\Collectives\Mount;
 
-use OC;
 use OC\Files\Cache\Propagator;
 use OC\Files\Storage\Storage;
 use OC\Files\Storage\Wrapper\Wrapper;
+use OCP\IDBConnection;
+use OCP\Server;
 
 class NoExcludePropagatorStorageWrapper extends Wrapper {
 	/**
@@ -26,7 +27,7 @@ public function getPropagator($storage = null): Propagator {
 			$storage = $this;
 		}
 		if (!isset($storage->propagator)) {
-			$storage->propagator = new Propagator($storage, OC::$server->getDatabaseConnection());
+			$storage->propagator = new Propagator($storage, Server::get(IDBConnection::class));
 		}
 		return $storage->propagator;
 	}

lib/Service/CollectiveService.php

@@ -9,8 +9,6 @@
 
 namespace OCA\Collectives\Service;
 
-use OC;
-use OC\Files\Node\File;
 use OCA\Circles\Model\Member;
 use OCA\Collectives\Db\Collective;
 use OCA\Collectives\Db\CollectiveMapper;
@@ -26,10 +24,12 @@
 use OCP\App\IAppManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\InvalidateMountCacheEvent;
+use OCP\Files\File;
 use OCP\Files\InvalidPathException;
 use OCP\Files\NotFoundException as FilesNotFoundException;
 use OCP\Files\NotPermittedException as FilesNotPermittedException;
 use OCP\IL10N;
+use OCP\Server;
 use Symfony\Component\String\Slugger\SluggerInterface;
 
 class CollectiveService extends CollectiveServiceBase {
@@ -56,13 +56,13 @@ public function __construct(
 
 	private function initPageTrashBackend(): void {
 		if ($this->appManager->isEnabledForUser('files_trashbin')) {
-			$this->pageTrashBackend = OC::$server->get(PageTrashBackend::class);
+			$this->pageTrashBackend = Server::get(PageTrashBackend::class);
 		}
 	}
 
 	private function initPageVersionsBackend(): void {
 		if ($this->appManager->isEnabledForUser('files_versions')) {
-			$this->pageVersionsBackend = OC::$server->get(VersionsBackend::class);
+			$this->pageVersionsBackend = Server::get(VersionsBackend::class);
 		}
 	}
 

lib/Service/PageService.php

@@ -10,7 +10,6 @@
 namespace OCA\Collectives\Service;
 
 use Exception;
-use OC;
 use OC_Util;
 use OCA\Collectives\Db\Collective;
 use OCA\Collectives\Db\Page;
@@ -32,6 +31,7 @@
 use OCP\IConfig;
 use OCP\IUserManager;
 use OCP\Lock\LockedException;
+use OCP\Server;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\String\Slugger\SluggerInterface;
 
@@ -64,7 +64,7 @@ public function __construct(
 
 	private function initTrashBackend(): void {
 		if ($this->appManager->isEnabledForUser('files_trashbin')) {
-			$this->trashBackend = OC::$server->get(PageTrashBackend::class);
+			$this->trashBackend = Server::get(PageTrashBackend::class);
 		}
 	}
 

psalm.xml

@@ -36,10 +36,12 @@
 			<errorLevel type="suppress">
 				<referencedClass name="Doctrine\DBAL\Types\Type" />
 				<referencedClass name="OCP\SetupCheck\ISetupCheck" />
+				<referencedClass name="OCA\Richdocuments\Db\WopiMapper" />
 			</errorLevel>
 		</UndefinedClass>
 		<UndefinedDocblockClass>
 			<errorLevel type="suppress">
+				<referencedClass name="OCA\Richdocuments\Db\WopiMapper" />
 				<referencedClass name="Doctrine\DBAL\Driver\Statement" />
 				<referencedClass name="Doctrine\DBAL\Schema\Schema" />
 				<referencedClass name="Doctrine\DBAL\Schema\SchemaException" />

tests/Unit/BackgroundJob/CollectiveVersionsExpireManagerTest.php

@@ -9,7 +9,6 @@
 
 namespace BackgroundJob;
 
-use OC\Files\FileInfo;
 use OC\User\User;
 use OCA\Collectives\Db\CollectiveMapper;
 use OCA\Collectives\Mount\CollectiveFolderManager;
@@ -18,6 +17,7 @@
 use OCA\Collectives\Versions\VersionsBackend;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\FileInfo;
 use OCP\IDBConnection;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Container\ContainerInterface;

tests/Unit/Fs/NodeHelperTest.php

@@ -9,10 +9,10 @@
 
 namespace Unit\Fs;
 
-use OC\Files\Node\File;
-use OC\Files\Node\Folder;
 use OCA\Collectives\Fs\NodeHelper;
 use OCA\Collectives\Service\NotFoundException;
+use OCP\Files\File;
+use OCP\Files\Folder;
 use OCP\IDBConnection;
 use OCP\IL10N;
 use PHPUnit\Framework\TestCase;

tests/Unit/Fs/UserFolderHelperTest.php

@@ -9,11 +9,11 @@
 
 namespace Unit\Fs;
 
-use OC\Files\Node\File;
-use OC\Files\Node\Folder;
 use OCA\Collectives\Db\Collective;
 use OCA\Collectives\Fs\UserFolderHelper;
 use OCA\Collectives\Service\NotPermittedException;
+use OCP\Files\File;
+use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\IAppConfig;
 use OCP\IConfig;

tests/Unit/Search/PageContentProviderTest.php

@@ -9,7 +9,6 @@
 
 namespace Unit\Service;
 
-use OC\Files\Node\Folder;
 use OC\Search\SearchQuery;
 use OCA\Collectives\Db\Collective;
 use OCA\Collectives\Search\PageContentProvider;
@@ -18,6 +17,7 @@
 use OCA\Collectives\Service\PageService;
 use OCA\Collectives\Service\SearchService;
 use OCP\App\IAppManager;
+use OCP\Files\Folder;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;

tests/Unit/Service/AttachmentServiceTest.php

@@ -9,9 +9,9 @@
 
 namespace Unit\Service;
 
-use OC\Files\Node\File;
-use OC\Files\Node\Folder;
 use OCA\Collectives\Service\AttachmentService;
+use OCP\Files\File;
+use OCP\Files\Folder;
 use OCP\IPreview;
 use PHPUnit\Framework\TestCase;
 

tests/Unit/Service/CollectiveServiceTest.php

@@ -9,8 +9,6 @@
 
 namespace Unit\Service;
 
-use OC\Files\Node\File;
-use OC\Files\Node\Folder;
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Member;
 use OCA\Collectives\Db\Collective;
@@ -29,6 +27,8 @@
 use OCA\Collectives\Service\UnprocessableEntityException;
 use OCP\App\IAppManager;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\File;
+use OCP\Files\Folder;
 use OCP\IL10N;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\String\Slugger\SluggerInterface;

tests/Unit/Service/CollectiveShareServiceTest.php

@@ -9,7 +9,6 @@
 
 namespace Unit\Service;
 
-use OC\Files\Node\Folder;
 use OC\Share20\Share;
 use OCA\Collectives\Db\Collective;
 use OCA\Collectives\Db\CollectiveShare;
@@ -20,6 +19,7 @@
 use OCA\Collectives\Service\PageService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\Files\Folder;
 use OCP\IL10N;
 use OCP\Lock\LockedException;
 use OCP\Share\Exceptions\GenericShareException;

tests/Unit/Service/PageServiceTest.php

@@ -11,8 +11,6 @@
 
 use OC\App\AppManager;
 use OC\Files\Mount\MountPoint;
-use OC\Files\Node\File;
-use OC\Files\Node\Folder;
 use OCA\Circles\Model\Member;
 use OCA\Collectives\Db\Collective;
 use OCA\Collectives\Db\Page;
@@ -27,6 +25,9 @@
 use OCA\Collectives\Service\NotPermittedException;
 use OCA\Collectives\Service\PageService;
 use OCA\Collectives\Service\SessionService;
+use OCP\Files\File;
+use OCP\Files\Folder;
+use OCP\Files\Mount\IMountPoint;
 use OCP\Files\NotFoundException as FilesNotFoundException;
 use OCP\IConfig;
 use OCP\IUserManager;
@@ -198,7 +199,7 @@ public function testGetIndexPageFileBrokenIndex(): void {
 		PageService::getIndexPageFile($folder);
 	}
 
-	private function prepareFile(string $fileName, Folder $parent, MountPoint $mountPoint, int $id = 1): File {
+	private function prepareFile(string $fileName, Folder $parent, IMountPoint $mountPoint, int $id = 1): File {
 		$file = $this->createMock(File::class);
 		$file->method('getId')
 			->willReturn($id);
@@ -309,9 +310,7 @@ public function testGetPagesFromFolderRecursive(): void {
 		$folder->method('getName')
 			->willReturn('testfolder');
 
-		$mountPoint = $this->getMockBuilder(MountPoint::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$mountPoint = $this->createMock(IMountPoint::class);
 		$mountPoint->method('getMountPoint')->willReturn('/files/user/Collectives/collective/');
 
 		$indexFile = $this->prepareFile('Readme.md', $folder, $mountPoint, 101);

tests/psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
+<files psalm-version="6.14.3@d0b040a91f280f071c1abcb1b77ce3822058725a">
   <file src="lib/Fs/UserFolderHelper.php">
     <UndefinedClass>
       <code><![CDATA[$e]]></code>
@@ -16,11 +16,6 @@
       <code><![CDATA[$maskedStorage]]></code>
     </InvalidArgument>
   </file>
-  <file src="lib/Service/CollectiveService.php">
-    <UndefinedClass>
-      <code><![CDATA[File]]></code>
-    </UndefinedClass>
-  </file>
   <file src="lib/Service/PageService.php">
     <UndefinedClass>
       <code><![CDATA[$this->pushQueue]]></code>

tests/stub.phpstub

@@ -8,14 +8,10 @@ declare(strict_types=1);
  */
 
 namespace {
-	use OCP\IServerContainer;
-
 	class OC {
 		static $CLI = false;
 		/** @var string */
 		static $WEBROOT;
-		/** @var IServerContainer */
-		static $server;
 	}
 }