Skip to content

[stable21] Optimize FileSystemTags workflow for groupfolder #30682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 4 commits into from
Jan 17, 2022
Merged

[stable21] Optimize FileSystemTags workflow for groupfolder #30682

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31fb8d0
Optimize FileSystemTags workflow for groupfolder
CarlSchwan Jan 7, 2022
a735773
The storage is not static anymore
CarlSchwan Jan 7, 2022
73e402f
Add helper method in Wrapper
CarlSchwan Jan 10, 2022
396157a
Fix psalm issues
CarlSchwan Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix psalm issues 
Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
@CarlSchwan @backportbot
CarlSchwan authored and backportbot[bot] committed Jan 14, 2022
commit 396157af18370a4dd8114a958c5cfe2da6f50393
5 changes: 4 additions & 1 deletion apps/workflowengine/lib/Check/FileSystemTags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,10 @@ protected function getFileIds(ICache $cache, $path, $isExternalStorage) {
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();
Expand Down
12 changes: 6 additions & 6 deletions lib/private/Files/Storage/Wrapper/Wrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,19 +499,19 @@ public function instanceOfStorage($class) {
}

/**
* @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;
Expand Down