Skip to content

Commit b69af83

Browse files
committed
refactor: Rebase master on top of node changes
Signed-off-by: Carl Schwan <[email protected]>
1 parent 84b3107 commit b69af83

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

apps/dav/lib/Connector/Sabre/File.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -543,9 +543,6 @@ public function getDirectDownload(): array|false {
543543
}
544544
$node = $this->getNode();
545545
$storage = $node->getStorage();
546-
if (!$storage) {
547-
return false;
548-
}
549546

550547
if (!($node->getPermissions() & Constants::PERMISSION_READ)) {
551548
return false;

build/psalm-baseline.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,6 @@
626626
<code><![CDATA[resolvePath]]></code>
627627
<code><![CDATA[resolvePath]]></code>
628628
<code><![CDATA[resolvePath]]></code>
629-
<code><![CDATA[resolvePath]]></code>
630629
<code><![CDATA[touch]]></code>
631630
<code><![CDATA[unlink]]></code>
632631
</InternalMethod>

lib/private/Share20/Manager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ public function userDeletedFromGroup($uid, $gid) {
16011601
}
16021602

16031603
#[\Override]
1604-
public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false) {
1604+
public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false): array {
16051605
$owner = $path->getOwner();
16061606

16071607
if ($owner === null) {

lib/public/Share/IManager.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,10 @@ public function userDeletedFromGroup($uid, $gid);
275275
* @param bool $currentAccess Should the user have currently access to the file
276276
* @return ($currentAccess is true
277277
* ? array{
278-
* users?: array<string, array{node_id: int, node_path: string}>,
279-
* remote?: array<string, array{node_id: int, node_path: string}>,
278+
* users?: array<string, array{node_id: ?int, node_path: string}>,
279+
* remote?: array<string, array{node_id: ?int, node_path: string}>,
280280
* public?: bool,
281-
* mail?: array<string, array{node_id: int, node_path: string}>
281+
* mail?: array<string, array{node_id: ?int, node_path: string}>
282282
* }
283283
* : array{users?: list<string>, remote?: bool, public?: bool, mail?: list<string>})
284284
* @since 12.0.0

0 commit comments

Comments
 (0)