chore: Fix psalm errors

Signed-off-by: Louis Chemineau <[email protected]>

lib/Sabre/Album/AlbumRoot.php

@@ -24,23 +24,13 @@
 use Sabre\DAV\INode;
 
 class AlbumRoot implements ICollection, ICopyTarget {
-	protected AlbumMapper $albumMapper;
-	protected AlbumWithFiles $album;
-	protected IRootFolder $rootFolder;
-	protected string $userId;
-
 	public function __construct(
-		AlbumMapper $albumMapper,
-		AlbumWithFiles $album,
-		IRootFolder $rootFolder,
-		string $userId,
-		UserConfigService $userConfigService
+		protected AlbumMapper $albumMapper,
+		protected AlbumWithFiles $album,
+		protected IRootFolder $rootFolder,
+		protected string $userId,
+		protected UserConfigService $userConfigService
 	) {
-		$this->albumMapper = $albumMapper;
-		$this->album = $album;
-		$this->rootFolder = $rootFolder;
-		$this->userId = $userId;
-		$this->userConfigService = $userConfigService;
 	}
 
 	/**
@@ -73,7 +63,7 @@ protected function getPhotosLocationInfo() {
 	 *
 	 * @param string $name
 	 * @param null|resource|string $data
-	 * @return void
+	 * @return string|null
 	 */
 	public function createFile($name, $data = null) {
 		try {
@@ -92,7 +82,7 @@ public function createFile($name, $data = null) {
 			}
 
 			// Check for conflict and rename the file accordingly
-			$newName = \basename(\OC_Helper::buildNotExistingFileName($photosLocation, $name));
+			$newName = $photosFolder->getNonExistingName($name);
 
 			$node = $photosFolder->newFile($newName, $data);
 			$this->addFile($node->getId(), $node->getOwner()->getUID());
@@ -112,6 +102,9 @@ public function createDirectory($name) {
 		throw new Forbidden('Not allowed to create directories in this folder');
 	}
 
+	/**
+	 * @return AlbumPhoto[]
+	 */
 	public function getChildren(): array {
 		return array_map(function (AlbumFile $file) {
 			return new AlbumPhoto($this->albumMapper, $this->album->getAlbum(), $file, $this->rootFolder, $this->rootFolder->getUserFolder($this->userId));

lib/Sabre/Album/PublicAlbumRoot.php

@@ -57,7 +57,6 @@ public function setCollaborators($collaborators): array {
 		throw new Forbidden('Not allowed to collaborators a public album');
 	}
 
-	/** @return never */
 	public function getChildren(): array {
 		return array_map(function (AlbumFile $file) {
 			return new PublicAlbumPhoto($this->albumMapper, $this->album->getAlbum(), $file, $this->rootFolder, $this->rootFolder->getUserFolder($this->userId));

lib/Sabre/Album/SharedAlbumRoot.php

@@ -33,7 +33,6 @@ public function __construct(
 			$rootFolder,
 			$userId,
 			$userConfigService,
-			$userManager
 		);
 
 		$this->userManager = $userManager;

lib/Sabre/PhotosHome.php

@@ -80,7 +80,7 @@ public function getChild($name) {
 	}
 
 	/**
-	 * @return (AlbumsHome)[]
+	 * @return (AlbumsHome|SharedAlbumsHome|PlacesHome)[]
 	 */
 	public function getChildren(): array {
 		return [

lib/Sabre/Place/PlaceRoot.php

@@ -19,7 +19,7 @@
 use Sabre\DAV\ICollection;
 
 class PlaceRoot implements ICollection {
-	/** @var PlaceFile[]|null */
+	/** @var PlacePhoto[]|null */
 	protected ?array $children = null;
 
 	public function __construct(

lib/Sabre/PublicRootCollection.php

@@ -63,7 +63,7 @@ public function getChildForPrincipal(array $principalInfo): PublicAlbumRoot {
 	 *
 	 * @throws NotFound
 	 *
-	 * @return DAV\INode
+	 * @return \Sabre\DAV\INode
 	 */
 	public function getChild($name) {
 		$this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), self::BRUTEFORCE_ACTION);

psalm.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <psalm errorLevel="4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns="https://getpsalm.org/schema/config"
-	xsi:schemaLocation="https://getpsalm.org/schema/config vendor-bin/psalm/vendor/vimeo/psalm/config.xsd"
-	errorBaseline="tests/psalm-baseline.xml">
+	xsi:schemaLocation="https://getpsalm.org/schema/config https://getpsalm.org/schema/config"
+	errorBaseline="tests/psalm-baseline.xml"
+	autoloader="vendor-bin/psalm/vendor/autoload.php">
 	<stubs>
 		<file name="tests/stub.phpstub" preloadClasses="true" />
 	</stubs>

vendor-bin/psalm/composer.json

@@ -5,4 +5,4 @@
         "symfony/console": "^5.4.24",
         "sabre/dav": "^4.4.0"
     }
-}
+}