Browse Source

Fix psalm issues

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
tags/v24.0.0beta1
Carl Schwan 2 years ago
parent
commit
cbf9064b8e
No account linked to committer's email address

+ 4
- 1
apps/workflowengine/lib/Check/FileSystemTags.php View File

@@ -144,7 +144,10 @@ class FileSystemTags implements ICheck, IFileCheck {
if ($groupFolderStorage === null) {
throw new \LogicException('Should not happen: Storage is instance of GroupFolderStorage but no group folder storage found while unwrapping.');
}
/** @psalm-suppress UndefinedMethod */
/**
* @psalm-suppress UndefinedDocblockClass
* @psalm-suppress UndefinedInterfaceMethod
*/
$cacheId = $cache->getNumericStorageId() . '/' . $groupFolderStorage->getFolderId();
} else {
$cacheId = $cache->getNumericStorageId();

+ 6
- 6
lib/private/Files/Storage/Wrapper/Wrapper.php View File

@@ -498,19 +498,19 @@ class Wrapper implements \OC\Files\Storage\Storage, ILockingStorage, IWriteStrea
}

/**
* @template T of IStorage
* @param class-string<T> $class
* @return ?T
* @psalm-template T of IStorage
* @psalm-param class-string<T> $class
* @psalm-return T|null
*/
public function getInstanceOfStorage(string $class): ?IStorage {
public function getInstanceOfStorage(string $class) {
$storage = $this;
while ($storage->instanceOfStorage(Wrapper::class)) {
while ($storage instanceof Wrapper) {
if ($storage instanceof $class) {
break;
}
$storage = $storage->getWrapperStorage();
}
if (!is_a($storage, $class)) {
if (!($storage instanceof $class)) {
return null;
}
return $storage;

Loading…
Cancel
Save