Skip to content

Commit ce0b6ee

Browse files
committed
fix(filesystem): Fix type hinting in Filesystem
Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>
1 parent 33c9efc commit ce0b6ee

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

build/psalm-baseline.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3832,18 +3832,6 @@
38323832
<code><![CDATA[array{int, string, int}]]></code>
38333833
</MoreSpecificReturnType>
38343834
</file>
3835-
<file src="lib/private/Files/Filesystem.php">
3836-
<LessSpecificReturnStatement>
3837-
<code><![CDATA[$mount->getStorage()]]></code>
3838-
<code><![CDATA[self::getMountManager()->findByNumericId($id)]]></code>
3839-
<code><![CDATA[self::getMountManager()->findByStorageId($id)]]></code>
3840-
</LessSpecificReturnStatement>
3841-
<MoreSpecificReturnType>
3842-
<code><![CDATA[Mount\MountPoint[]]]></code>
3843-
<code><![CDATA[Mount\MountPoint[]]]></code>
3844-
<code><![CDATA[\OC\Files\Storage\Storage|null]]></code>
3845-
</MoreSpecificReturnType>
3846-
</file>
38473835
<file src="lib/private/Files/Mount/MountPoint.php">
38483836
<UndefinedInterfaceMethod>
38493837
<code><![CDATA[wrap]]></code>

lib/private/Files/Filesystem.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public static function getMountPoints($path) {
246246
* get the storage mounted at $mountPoint
247247
*
248248
* @param string $mountPoint
249-
* @return \OC\Files\Storage\Storage|null
249+
* @return \OCP\Files\Storage\IStorage|null
250250
*/
251251
public static function getStorage($mountPoint) {
252252
$mount = self::getMountManager()->find($mountPoint);
@@ -255,15 +255,15 @@ public static function getStorage($mountPoint) {
255255

256256
/**
257257
* @param string $id
258-
* @return Mount\MountPoint[]
258+
* @return \OCP\Files\Mount\IMountPoint[]
259259
*/
260260
public static function getMountByStorageId($id) {
261261
return self::getMountManager()->findByStorageId($id);
262262
}
263263

264264
/**
265265
* @param int $id
266-
* @return Mount\MountPoint[]
266+
* @return \OCP\Files\Mount\IMountPoint[]
267267
*/
268268
public static function getMountByNumericId($id) {
269269
return self::getMountManager()->findByNumericId($id);

0 commit comments

Comments
 (0)