refactor: Add type-hinting to Node-API

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

apps/dav/lib/Connector/Sabre/Directory.php

@@ -7,7 +7,9 @@
  */
 namespace OCA\DAV\Connector\Sabre;
 
+use OC\Files\Mount\DummyMountPoint;
 use OC\Files\Mount\MoveableMount;
+use OC\Files\Storage\FailedStorage;
 use OC\Files\View;
 use OCA\DAV\AppInfo\Application;
 use OCA\DAV\Connector\Sabre\Exception\FileLocked;
@@ -106,9 +108,9 @@ public function createFile($name, $data = null) {
 			$info = $this->fileView->getFileInfo($this->path . '/' . $name);
 			if (!$info) {
 				// use a dummy FileInfo which is acceptable here since it will be refreshed after the put is complete
-				$info = new \OC\Files\FileInfo($path, null, null, [
+				$info = new \OC\Files\FileInfo($path, new FailedStorage(['exception' => new \LogicException('Dummy storage') ]), '', [
 					'type' => FileInfo::TYPE_FILE
-				], null);
+				], new DummyMountPoint());
 			}
 			$node = new File($this->fileView, $info);
 

apps/dav/lib/Connector/Sabre/File.php

@@ -54,12 +54,6 @@ class File extends Node implements IFile {
 
 	/**
 	 * Sets up the node, expects a full path name
-	 *
-	 * @param View $view
-	 * @param FileInfo $info
-	 * @param ?\OCP\Share\IManager $shareManager
-	 * @param ?IRequest $request
-	 * @param ?IL10N $l10n
 	 */
 	public function __construct(View $view, FileInfo $info, ?IManager $shareManager = null, ?IRequest $request = null, ?IL10N $l10n = null) {
 		parent::__construct($view, $info, $shareManager);

apps/dav/lib/Connector/Sabre/Node.php

@@ -27,33 +27,20 @@
 abstract class Node implements \Sabre\DAV\INode {
 	/**
 	 * The path to the current node
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	protected FileInfo $info;
-
-	/**
-	 * @var IManager
 	 */
-	protected $shareManager;
-
+	protected string $path = '';
 	protected \OCP\Files\Node $node;
 
 	/**
 	 * Sets up the node, expects a full path name
 	 */
 	public function __construct(
 		protected View $fileView,
-		FileInfo $info,
-		?IManager $shareManager = null,
+		protected FileInfo $info,
+		protected ?IManager $shareManager = null,
 	) {
 		$this->path = $this->fileView->getRelativePath($info->getPath());
-		$this->info = $info;
-		if ($shareManager) {
-			$this->shareManager = $shareManager;
-		} else {
+		if (!$this->shareManager) {
 			$this->shareManager = Server::get(\OCP\Share\IManager::class);
 		}
 		if ($info instanceof Folder || $info instanceof File) {
@@ -141,7 +128,7 @@ public function setName($name) {
 	public function getLastModified() {
 		$timestamp = $this->info->getMtime();
 		if (!empty($timestamp)) {
-			return (int)$timestamp;
+			return $timestamp;
 		}
 		return $timestamp;
 	}

apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php

@@ -21,6 +21,7 @@
 use OCP\Files\ForbiddenException;
 use OCP\Files\InvalidPathException;
 use OCP\Files\Mount\IMountPoint;
+use OCP\Files\Storage\IStorage;
 use OCP\Files\StorageNotAvailableException;
 use PHPUnit\Framework\MockObject\MockObject;
 use Test\Traits\UserTrait;
@@ -68,6 +69,8 @@ protected function setUp(): void {
 		parent::setUp();
 
 		$this->view = $this->createMock(View::class);
+		$this->view->method('getAbsolutePath')->willReturnArgument(0);
+
 		$this->info = $this->createMock(FileInfo::class);
 		$this->info->method('isReadable')
 			->willReturn(true);
@@ -102,7 +105,7 @@ public function testDeleteRootFolderFails(): void {
 			->willReturn(true);
 		$this->view->expects($this->never())
 			->method('rmdir');
-		$dir = $this->getDir();
+		$dir = $this->getDir('/');
 		$dir->delete();
 	}
 
@@ -226,6 +229,8 @@ public function testGetChildrenNoPermission(): void {
 			->method('isReadable')
 			->willReturn(false);
 
+		$this->view->method('getRelativePath')->willReturnArgument(0);
+
 		$dir = new Directory($this->view, $info);
 		$dir->getChildren();
 	}
@@ -238,6 +243,8 @@ public function testGetChildNoPermission(): void {
 			->method('isReadable')
 			->willReturn(false);
 
+		$this->view->method('getRelativePath')->willReturnArgument(0);
+
 		$dir = new Directory($this->view, $this->info);
 		$dir->getChild('test');
 	}
@@ -250,6 +257,8 @@ public function testGetChildThrowStorageNotAvailableException(): void {
 			->method('getFileInfo')
 			->willThrowException(new StorageNotAvailableException());
 
+		$this->view->method('getRelativePath')->willReturnArgument(0);
+
 		$dir = new Directory($this->view, $this->info);
 		$dir->getChild('.');
 	}
@@ -264,6 +273,8 @@ public function testGetChildThrowInvalidPath(): void {
 		$this->view->expects($this->never())
 			->method('getFileInfo');
 
+		$this->view->method('getRelativePath')->willReturnArgument(0);
+
 		$dir = new Directory($this->view, $this->info);
 		$dir->getChild('.');
 	}
@@ -421,12 +432,12 @@ public static function moveSuccessProvider(): array {
 	private function moveTest(string $source, string $destination, array $updatables, array $deletables): void {
 		$view = new TestViewDirectory($updatables, $deletables);
 
-		$sourceInfo = new FileInfo($source, null, null, [
+		$sourceInfo = new FileInfo($source, $this->createMock(IStorage::class), '', [
 			'type' => FileInfo::TYPE_FOLDER,
-		], null);
-		$targetInfo = new FileInfo(dirname($destination), null, null, [
+		], $this->createMock(IMountPoint::class));
+		$targetInfo = new FileInfo(dirname($destination), $this->createMock(IStorage::class), '', [
 			'type' => FileInfo::TYPE_FOLDER,
-		], null);
+		], $this->createMock(IMountPoint::class));
 
 		$sourceNode = new Directory($view, $sourceInfo);
 		$targetNode = $this->getMockBuilder(Directory::class)
@@ -451,8 +462,8 @@ public function testFailingMove(): void {
 
 		$view = new TestViewDirectory($updatables, $deletables);
 
-		$sourceInfo = new FileInfo($source, null, null, ['type' => FileInfo::TYPE_FOLDER], null);
-		$targetInfo = new FileInfo(dirname($destination), null, null, ['type' => FileInfo::TYPE_FOLDER], null);
+		$sourceInfo = new FileInfo($source, $this->createMock(IStorage::class), '', ['type' => FileInfo::TYPE_FOLDER], $this->createMock(IMountPoint::class));
+		$targetInfo = new FileInfo(dirname($destination), $this->createMock(IStorage::class), '', ['type' => FileInfo::TYPE_FOLDER], $this->createMock(IMountPoint::class));
 
 		$sourceNode = new Directory($view, $sourceInfo);
 		$targetNode = $this->getMockBuilder(Directory::class)