From 1f96118ef96ec215384965abce80f2312f25c654 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 8 Jun 2026 14:44:32 +0200 Subject: [PATCH 1/2] test: cleanup users before userbackend test Signed-off-by: Robin Appelman --- tests/lib/User/DatabaseTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/lib/User/DatabaseTest.php b/tests/lib/User/DatabaseTest.php index 4f70b642b7e..1874b178589 100644 --- a/tests/lib/User/DatabaseTest.php +++ b/tests/lib/User/DatabaseTest.php @@ -43,6 +43,10 @@ class DatabaseTest extends Backend { $this->eventDispatcher = $this->createMock(IEventDispatcher::class); $this->backend = new Database($this->eventDispatcher); + + foreach ($this->backend->getUsers() as $user) { + $this->backend->deleteUser($user); + } } #[\Override] From 48dfc2be3ac4486720e9b29e9b305d9dcfa1e0d6 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 8 Jun 2026 13:34:57 +0200 Subject: [PATCH 2/2] chore: psalm fix Signed-off-by: Robin Appelman --- lib/private/Files/Storage/Wrapper/DirPermissionsMask.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/Files/Storage/Wrapper/DirPermissionsMask.php b/lib/private/Files/Storage/Wrapper/DirPermissionsMask.php index 7989002496e..8d4dbbabbaa 100644 --- a/lib/private/Files/Storage/Wrapper/DirPermissionsMask.php +++ b/lib/private/Files/Storage/Wrapper/DirPermissionsMask.php @@ -10,8 +10,8 @@ declare(strict_types=1); namespace OC\Files\Storage\Wrapper; use OC\Files\Cache\Wrapper\CacheDirPermissionsMask; -use OC\Files\Storage\Storage; use OCP\Files\Cache\ICache; +use OCP\Files\Storage\IStorage; /** * While PermissionMask can mask a whole storage this can @@ -30,7 +30,7 @@ class DirPermissionsMask extends PermissionsMask { private readonly int $pathLength; /** - * @param array{storage: Storage, mask: int, path: string, ...} $parameters + * @param array{storage: IStorage, mask: int, path: string, ...} $parameters * @psalm-suppress MoreSpecificImplementedParamType * * $storage: The storage the permissions mask should be applied on