Skip to content

Commit 34cd91c

Browse files
committed
refactor: Fix some easy psalm issues in Files
Signed-off-by: Carl Schwan <carl.schwan@nextcloud.com>
1 parent 3d6699d commit 34cd91c

File tree

3 files changed

+2
-32
lines changed

3 files changed

+2
-32
lines changed

build/psalm-baseline.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3614,33 +3614,6 @@
36143614
<code><![CDATA[$stat === false]]></code>
36153615
</TypeDoesNotContainType>
36163616
</file>
3617-
<file src="lib/private/Files/Storage/LocalRootStorage.php">
3618-
<NoInterfaceProperties>
3619-
<code><![CDATA[$storage->scanner]]></code>
3620-
<code><![CDATA[$storage->scanner]]></code>
3621-
</NoInterfaceProperties>
3622-
</file>
3623-
<file src="lib/private/Files/Storage/Wrapper/Encoding.php">
3624-
<UndefinedInterfaceMethod>
3625-
<code><![CDATA[$this->namesCache]]></code>
3626-
<code><![CDATA[$this->namesCache]]></code>
3627-
<code><![CDATA[$this->namesCache]]></code>
3628-
<code><![CDATA[$this->namesCache]]></code>
3629-
<code><![CDATA[$this->namesCache]]></code>
3630-
<code><![CDATA[$this->namesCache]]></code>
3631-
<code><![CDATA[$this->namesCache]]></code>
3632-
<code><![CDATA[$this->namesCache]]></code>
3633-
<code><![CDATA[$this->namesCache]]></code>
3634-
<code><![CDATA[$this->namesCache]]></code>
3635-
<code><![CDATA[$this->namesCache]]></code>
3636-
<code><![CDATA[$this->namesCache]]></code>
3637-
<code><![CDATA[$this->namesCache]]></code>
3638-
<code><![CDATA[$this->namesCache]]></code>
3639-
<code><![CDATA[$this->namesCache]]></code>
3640-
<code><![CDATA[$this->namesCache]]></code>
3641-
<code><![CDATA[$this->namesCache]]></code>
3642-
</UndefinedInterfaceMethod>
3643-
</file>
36443617
<file src="lib/private/Files/Storage/Wrapper/Encryption.php">
36453618
<InvalidReturnStatement>
36463619
<code><![CDATA[$result]]></code>

lib/private/Files/Storage/LocalRootStorage.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public function getScanner(string $path = '', ?IStorage $storage = null): IScann
1717
if (!$storage) {
1818
$storage = $this;
1919
}
20+
/** @var Local $storage */
2021
return $storage->scanner ?? ($storage->scanner = new LocalRootScanner($storage));
2122
}
2223
}

lib/private/Files/Storage/Wrapper/Encoding.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use OCP\Cache\CappedMemoryCache;
1212
use OCP\Files\Cache\IScanner;
1313
use OCP\Files\Storage\IStorage;
14-
use OCP\ICache;
1514

1615
/**
1716
* Encoding wrapper that deals with file names that use unsupported encodings like NFD.
@@ -20,10 +19,7 @@
2019
* the actual given name and then try its NFD form.
2120
*/
2221
class Encoding extends Wrapper {
23-
/**
24-
* @var ICache
25-
*/
26-
private $namesCache;
22+
private CappedMemoryCache $namesCache;
2723

2824
/**
2925
* @param array $parameters

0 commit comments

Comments
 (0)