chore: Improve IStorage::getPermissions typing#59925
Open
CarlSchwan wants to merge 1 commit into
Open
Conversation
CarlSchwan
requested review from
artonge,
nfebe,
provokateurin and
sorbaugh
and removed request for
a team
provokateurin
approved these changes
Apr 27, 2026
Member
|
Would be nice to also do this on all setters and getters everywhere. |
artonge
approved these changes
Apr 28, 2026
CarlSchwan
force-pushed
the
work/istorage-type
branch
2 times, most recently
from
5004e8c to
8f7153f
Compare
Merged
Closed
CarlSchwan
force-pushed
the
work/istorage-type
branch
from
8f7153f to
8c97258
Compare
Signed-off-by: Carl Schwan <carlschwan@kde.org>
CarlSchwan
force-pushed
the
work/istorage-type
branch
from
8c97258 to
af73e49
Compare
Comment on lines
+248
to
+249
| /** @var int-mask-of<Constants::PERMISSION_*> $permissions */ | ||
| $permissions = $this->shareManager->getShareByToken($user)->getPermissions(); |
Member
There was a problem hiding this comment.
Move it to the method return type.
Member
Author
There was a problem hiding this comment.
It's already the return type of IShare::getPermissions, I don't get why this is not working :(
Member
There was a problem hiding this comment.
Maybe getShareByToken has a bad return type?
Member
Author
There was a problem hiding this comment.
Nope, it returns a IShare
The error is about int not being equal to the int mask. It feels like there is a bug in psalm with int-mask-of being converted to int implicitly
Comment on lines
263
to
296
| $permissions = $storage->getShare()->getPermissions(); | ||
| } else { | ||
| $permissions = $this->info->getPermissions(); | ||
| } | ||
|
|
||
| /* | ||
| * We can always share non moveable mount points with DELETE and UPDATE | ||
| * We can always share non-moveable mount points with DELETE and UPDATE | ||
| * Eventually we need to do this properly | ||
| */ | ||
| $mountpoint = $this->info->getMountPoint(); | ||
| if (!($mountpoint instanceof IMovableMount)) { | ||
| /** | ||
| * @psalm-suppress UnnecessaryVarAnnotation Rector doesn't trust the return type annotation | ||
| * @var string $mountpointpath | ||
| * @var string $mountpointPath | ||
| */ | ||
| $mountpointpath = $mountpoint->getMountPoint(); | ||
| if (str_ends_with($mountpointpath, '/')) { | ||
| $mountpointpath = substr($mountpointpath, 0, -1); | ||
| $mountpointPath = $mountpoint->getMountPoint(); | ||
| if (str_ends_with($mountpointPath, '/')) { | ||
| $mountpointPath = substr($mountpointPath, 0, -1); | ||
| } | ||
|
|
||
| if (!$mountpoint->getOption('readonly', false) && $mountpointpath === $this->info->getPath()) { | ||
| if (!$mountpoint->getOption('readonly', false) && $mountpointPath === $this->info->getPath()) { | ||
| $permissions |= Constants::PERMISSION_DELETE | Constants::PERMISSION_UPDATE; | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * Files can't have create or delete permissions | ||
| */ | ||
| if ($this->info->getType() === FileInfo::TYPE_FILE) { | ||
| $permissions &= ~(Constants::PERMISSION_CREATE | Constants::PERMISSION_DELETE); | ||
| } | ||
|
|
||
| /** @var int-mask-of<Constants::PERMISSION_*> $permissions */ | ||
| return $permissions; |
Member
There was a problem hiding this comment.
These two getPermissions calls need the correct return type to remove the var annotation.
Comment on lines
+524
to
+525
| /** @var int-mask-of<Constants::PERMISSION_*> $ncPermissions */ | ||
| return $ncPermissions; |
Member
There was a problem hiding this comment.
This should not be needed.
Comment on lines
+258
to
259
| /** @var int-mask-of<Constants::PERMISSION_*> $permissions */ | ||
| $permissions = parent::getPermissions($path) & $this->superShare->getPermissions(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
TODO
Checklist
3. to review, feature component)stable32)AI (if applicable)