Add fixes detected by psalm

Signed-off-by: Jonas <[email protected]>

lib/Command/PageTrashCleanup.php

@@ -4,13 +4,13 @@
 
 namespace OCA\Collectives\Command;
 
-use OC\App\AppManager;
 use OC\Core\Command\Base;
 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 Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -22,7 +22,7 @@ class PageTrashCleanup extends Base {
 	private CollectiveMapper $collectiveMapper;
 
 	public function __construct(
-		AppManager $appManager,
+		IAppManager $appManager,
 		CollectiveMapper $collectiveMapper
 	) {
 		parent::__construct();

lib/Service/CollectiveService.php

@@ -2,7 +2,6 @@
 
 namespace OCA\Collectives\Service;
 
-use OC\App\AppManager;
 use OC\Files\Node\File;
 use OCA\Circles\Model\Member;
 use OCA\Collectives\Db\Collective;
@@ -15,6 +14,7 @@
 use OCA\Collectives\Mount\CollectiveFolderManager;
 use OCA\Collectives\Trash\PageTrashBackend;
 use OCA\Collectives\Versions\VersionsBackend;
+use OCP\App\IAppManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\InvalidateMountCacheEvent;
 use OCP\Files\InvalidPathException;
@@ -23,7 +23,7 @@
 use OCP\IL10N;
 
 class CollectiveService extends CollectiveServiceBase {
-	private AppManager $appManager;
+	private IAppManager $appManager;
 	private CollectiveHelper $collectiveHelper;
 	private CollectiveFolderManager $collectiveFolderManager;
 	private CollectiveShareService $shareService;
@@ -35,7 +35,7 @@ class CollectiveService extends CollectiveServiceBase {
 	private ?VersionsBackend $pageVersionsBackend = null;
 
 	/**
-	 * @param AppManager                   $appManager
+	 * @param IAppManager                  $appManager
 	 * @param CollectiveMapper             $collectiveMapper
 	 * @param CollectiveHelper             $collectiveHelper
 	 * @param CollectiveFolderManager      $collectiveFolderManager
@@ -47,7 +47,7 @@ class CollectiveService extends CollectiveServiceBase {
 	 * @param IEventDispatcher             $eventDispatcher
 	 */
 	public function __construct(
-		AppManager $appManager,
+		IAppManager $appManager,
 		CollectiveMapper $collectiveMapper,
 		CollectiveHelper $collectiveHelper,
 		CollectiveFolderManager $collectiveFolderManager,

lib/Service/PageService.php

@@ -2,7 +2,6 @@
 
 namespace OCA\Collectives\Service;
 
-use OC\App\AppManager;
 use OCA\Collectives\Db\Page;
 use OCA\Collectives\Db\PageMapper;
 use OCA\Collectives\Fs\NodeHelper;
@@ -11,6 +10,7 @@
 use OCA\Collectives\Model\PageInfo;
 use OCA\Collectives\Trash\PageTrashBackend;
 use OCA\NotifyPush\Queue\IQueue;
+use OCP\App\IAppManager;
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\InvalidPathException;
@@ -25,7 +25,7 @@
 class PageService {
 	private const DEFAULT_PAGE_TITLE = 'New Page';
 
-	private AppManager $appManager;
+	private IAppManager $appManager;
 	private PageMapper $pageMapper;
 	private NodeHelper $nodeHelper;
 	private CollectiveServiceBase $collectiveService;
@@ -37,7 +37,7 @@ class PageService {
 	private ?PageTrashBackend $trashBackend = null;
 
 	/**
-	 * @param AppManager            $appManager
+	 * @param IAppManager           $appManager
 	 * @param PageMapper            $pageMapper
 	 * @param NodeHelper            $nodeHelper
 	 * @param CollectiveServiceBase $collectiveService
@@ -46,7 +46,7 @@ class PageService {
 	 * @param IConfig               $config
 	 * @param ContainerInterface    $container
 	 */
-	public function __construct(AppManager $appManager,
+	public function __construct(IAppManager $appManager,
 		PageMapper $pageMapper,
 		NodeHelper $nodeHelper,
 		CollectiveServiceBase $collectiveService,
@@ -410,7 +410,7 @@ public function findAll(int $collectiveId, string $userId): array {
 	 * @param int    $collectiveId
 	 * @param string $userId
 	 *
-	 * @return PageInfo[]
+	 * @return array[]
 	 * @throws MissingDependencyException
 	 * @throws NotFoundException
 	 * @throws NotPermittedException

lib/Trash/PageTrashBackend.php

@@ -13,6 +13,7 @@
 use OCA\Files_Trashbin\Expiration;
 use OCA\Files_Trashbin\Trash\ITrashBackend;
 use OCA\Files_Trashbin\Trash\ITrashItem;
+use OCA\Files_Trashbin\Trash\TrashItem;
 use OCP\Constants;
 use OCP\Files\Folder;
 use OCP\Files\InvalidPathException;
@@ -67,7 +68,7 @@ public function setVersionsBackend(VersionsBackend $versionsBackend): void {
 	/**
 	 * @param IUser $user
 	 *
-	 * @return array|ITrashItem[]
+	 * @return array|CollectivePageTrashItem[]
 	 * @throws NotFoundException
 	 * @throws NotPermittedException
 	 */
@@ -79,7 +80,7 @@ public function listTrashRoot(IUser $user): array {
 	/**
 	 * @param ITrashItem $trashItem
 	 *
-	 * @return array|ITrashItem[]
+	 * @return array|TrashItem[]
 	 * @throws NotFoundException
 	 * @throws NotPermittedException
 	 */
@@ -231,14 +232,14 @@ public function removeItem(ITrashItem $item): void {
 	}
 
 	/**
-	 * @param IUser      $user
-	 * @param int        $collectiveId
-	 * @param ITrashItem $item
+	 * @param IUser                   $user
+	 * @param int                     $collectiveId
+	 * @param CollectivePageTrashItem $item
 	 *
-	 * @return ITrashItem|null
+	 * @return TrashItem|null
 	 * @throws NotPermittedException
 	 */
-	private function findAttachmentFolderItem(IUser $user, int $collectiveId, ITrashItem $item): ?ITrashItem {
+	private function findAttachmentFolderItem(IUser $user, int $collectiveId, CollectivePageTrashItem $item): ?TrashItem {
 		$attachmentsPrefix = ".attachments.";
 		if (strpos($item->getName(), $attachmentsPrefix) === 0) {
 			// Passed item is already an attachment folder
@@ -336,12 +337,12 @@ private function userHasAccessToFolder(IUser $user, int $collectiveId): bool {
 
 	/**
 	 * @param IUser      $user
-	 * @param ITrashItem $trashItem
+	 * @param TrashItem  $trashItem
 	 *
 	 * @return Node|null
 	 * @throws NotPermittedException
 	 */
-	private function getNodeForTrashItem(IUser $user, ITrashItem $trashItem): ?Node {
+	private function getNodeForTrashItem(IUser $user, TrashItem $trashItem): ?Node {
 		[, $collectiveId, $path] = explode('/', $trashItem->getTrashPath(), 3);
 		if (!$this->userHasAccessToFolder($user, (int)$collectiveId)) {
 			throw new NotPermittedException('No permission to trash for collective');
@@ -384,7 +385,7 @@ private function getTrashRoot(): Folder {
 	 */
 	private function getTrashFolder(int $collectiveId): Folder {
 		try {
-			$folder = $this->getTrashRoot()->get($collectiveId);
+			$folder = $this->getTrashRoot()->get((string)$collectiveId);
 			if (!$folder instanceof Folder) {
 				throw new NotPermittedException('Trash root is not a folder');
 			}
@@ -429,7 +430,7 @@ private function getTrashForFolders(IUser $user, array $folders): array {
 				$key = $collectiveId . '/' . $name . '/' . $timestamp;
 				$originalLocation = isset($indexedRows[$key]) ? $indexedRows[$key]['original_location'] : '';
 
-				if (null !== $info = $item->getFileInfo()) {
+				if (method_exists($item, 'getFileInfo') && null !== $info = $item->getFileInfo()) {
 					$info['name'] = $name;
 					$items[] = new CollectivePageTrashItem(
 						$this,
@@ -473,10 +474,10 @@ public function getTrashNodeById(IUser $user, int $fileId): ?Node {
 	 * @param int   $collectiveId
 	 * @param int   $fileId
 	 *
-	 * @return ITrashItem|null
+	 * @return TrashItem|null
 	 * @throws NotPermittedException
 	 */
-	public function getTrashItemByCollectiveAndId(IUser $user, int $collectiveId, int $fileId): ?ITrashItem {
+	public function getTrashItemByCollectiveAndId(IUser $user, int $collectiveId, int $fileId): ?TrashItem {
 		try {
 			if (!$this->userHasAccessToFolder($user, (int)$collectiveId)) {
 				return null;
@@ -486,7 +487,7 @@ public function getTrashItemByCollectiveAndId(IUser $user, int $collectiveId, in
 			$trashFolder = $this->getTrashFolder($collectiveId);
 			$trashNode = $this->getTrashNodeById($user, $fileId);
 			$trashItem = $this->trashManager->getTrashItemByFileId($fileId);
-			if ($trashItem && $trashNode) {
+			if ($trashItem && $trashNode && method_exists($trashNode, 'getFileInfo')) {
 				$pathParts = pathinfo($trashNode->getName());
 				$name = $pathParts['filename'];
 

tests/Unit/Service/CollectiveServiceTest.php

@@ -2,7 +2,6 @@
 
 namespace Unit\Service;
 
-use OC\App\AppManager;
 use OC\Files\Node\File;
 use OC\Files\Node\Folder;
 use OCA\Circles\Model\Circle;
@@ -20,6 +19,7 @@
 use OCA\Collectives\Service\CollectiveShareService;
 use OCA\Collectives\Service\NotFoundException;
 use OCA\Collectives\Service\UnprocessableEntityException;
+use OCP\App\IAppManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IL10N;
 use PHPUnit\Framework\TestCase;
@@ -33,7 +33,7 @@ class CollectiveServiceTest extends TestCase {
 	private CollectiveService $service;
 
 	protected function setUp(): void {
-		$appManager = $this->getMockBuilder(AppManager::class)
+		$appManager = $this->getMockBuilder(IAppManager::class)
 			->disableOriginalConstructor()
 			->getMock();
 

tests/stub.phpstub

@@ -797,6 +797,61 @@ namespace OCA\Files_Versions {
     }
 }
 
+namespace OCA\Files_Trashbin {
+    class Expiration {
+        /**
+         * @param int $timestamp
+         * @param bool $quotaExceeded
+         * @return bool
+         */
+        public function isExpired($timestamp, $quotaExceeded = false) {}
+    }
+}
+
+namespace OCA\Files_Trashbin\Trash {
+	interface ITrashBackend {}
+
+	use OCP\Files\FileInfo;
+	interface ITrashItem extends FileInfo {
+	}
+
+	use OCP\IUser;
+	class TrashItem implements ITrashItem {
+		public function getOriginalLocation(): string {}
+		public function getDeletedTime(): int {}
+		public function getTrashPath(): string {}
+		public function getTrashPath(): string {}
+		public function getUser(): IUser {}
+		public function getEtag() {}
+		public function getSize($includeMounts = true) {}
+		public function getMtime() {}
+		public function getName() {}
+		public function getInternalPath() {}
+		public function getPath() {}
+		public function getMimetype() {}
+		public function getMimePart() {}
+		public function getStorage() {}
+		public function getId() {}
+		public function isEncrypted() {}
+		public function getPermissions() {}
+		public function getType() {}
+		public function isReadable() {}
+		public function isUpdateable() {}
+		public function isCreatable() {}
+		public function isDeletable() {}
+		public function isShareable() {}
+		public function isShared() {}
+		public function isMounted() {}
+		public function getMountPoint() {}
+		public function getOwner() {}
+		public function getChecksum() {}
+		public function getExtension(): string {}
+		public function getTitle(): string {}
+		public function getCreationTime(): int {}
+		public function getUploadTime(): int {}
+	}
+}
+
 namespace OCP\Files\Mount {
 	interface ISystemMountPoint {}
 }