sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55481 from nextcloud/carl/fix-psalm-easy 

refactor: Fix some easy psalm issues in Files
cleanup-legacy-trash
Andy Scherzinger 2025-10-06 12:11:02 +07:00 committed by GitHub
parent 6dec53a6bc 34cd91cc86
commit 40286b2fe2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
build/psalm-baseline.xml
Unescape Escape View File

@ -3558,33 +3558,6 @@
<code><![CDATA[$stat === false]]></code>
</TypeDoesNotContainType>
</file>
<file src="lib/private/Files/Storage/LocalRootStorage.php">
<NoInterfaceProperties>
<code><![CDATA[$storage->scanner]]></code>
<code><![CDATA[$storage->scanner]]></code>
</NoInterfaceProperties>
</file>
<file src="lib/private/Files/Storage/Wrapper/Encoding.php">
<UndefinedInterfaceMethod>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
<code><![CDATA[$this->namesCache]]></code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/Files/Storage/Wrapper/Encryption.php">
<InvalidReturnStatement>
<code><![CDATA[$result]]></code>

1
lib/private/Files/Storage/LocalRootStorage.php
Unescape Escape View File

@ -17,6 +17,7 @@ class LocalRootStorage extends Local {
if (!$storage) {
$storage = $this;
}
/** @var Local $storage */
return $storage->scanner ?? ($storage->scanner = new LocalRootScanner($storage));
}
}

6
lib/private/Files/Storage/Wrapper/Encoding.php
Unescape Escape View File

@ -11,7 +11,6 @@ use OC\Files\Filesystem;
use OCP\Cache\CappedMemoryCache;
use OCP\Files\Cache\IScanner;
use OCP\Files\Storage\IStorage;
use OCP\ICache;
/**
* Encoding wrapper that deals with file names that use unsupported encodings like NFD.
@ -20,10 +19,7 @@ use OCP\ICache;
* the actual given name and then try its NFD form.
*/
class Encoding extends Wrapper {
/**
* @var ICache
*/
private $namesCache;
private CappedMemoryCache $namesCache;
/**
* @param array $parameters