Skip to content

Commit f1a3c12

Browse files
committed
chore(deps): Update psalm to v6
Signed-off-by: provokateurin <[email protected]>
1 parent cf39897 commit f1a3c12

File tree

5 files changed

+549
-197
lines changed

5 files changed

+549
-197
lines changed

β€Žlib/CacheListener.php

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use OCP\Files\Cache\CacheEntryInsertedEvent;
1313
use OCP\Files\Cache\CacheEntryUpdatedEvent;
1414
use OCP\Files\Cache\ICacheEvent;
15+
use RuntimeException;
1516

1617
class CacheListener {
1718
public function __construct(
@@ -30,6 +31,10 @@ public function onCacheEvent(ICacheEvent $event): void {
3031
}
3132

3233
$jailedPath = preg_replace('/^__groupfolders\/\d+\//', '', $event->getPath());
34+
if ($jailedPath === null) {
35+
throw new RuntimeException('Failed to build jailed path');
36+
}
37+
3338
if ($jailedPath !== $event->getPath()) {
3439
$event->setPath($jailedPath);
3540
}

β€Žtests/Trash/TrashBackendTest.php

+2
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,10 @@ public function testHideItemInDeletedFolderAcl(): void {
145145
// everyone can see the parent folder
146146
$this->assertCount(1, $this->trashBackend->listTrashRoot($this->managerUser));
147147
$managerTrashFolder = current($this->trashBackend->listTrashRoot($this->managerUser));
148+
$this->assertNotFalse($managerTrashFolder);
148149
$this->assertCount(1, $this->trashBackend->listTrashRoot($this->normalUser));
149150
$normalTrashFolder = current($this->trashBackend->listTrashRoot($this->normalUser));
151+
$this->assertNotFalse($normalTrashFolder);
150152

151153
// only the manager can see the restricted child, both can see the un-restricted child
152154
$this->assertCount(2, $this->trashBackend->listTrashFolder($managerTrashFolder));

β€Žtests/psalm-baseline.xml

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0"/>
2+
<files psalm-version="6.0.0@b8e96bb617bf59382113b1b56cef751f648a7dc9">
3+
<file src="lib/DAV/ACLPlugin.php">
4+
<InvalidArgument>
5+
<code><![CDATA[fn (Rule $obj_a, Rule $obj_b): int => (
6+
$obj_a->getUserMapping()->getType() === $obj_b->getUserMapping()->getType() &&
7+
$obj_a->getUserMapping()->getId() === $obj_b->getUserMapping()->getId()
8+
) ? 0 : -1]]></code>
9+
</InvalidArgument>
10+
</file>
11+
<file src="lib/Versions/ExpireManager.php">
12+
<InvalidArgument>
13+
<code><![CDATA[fn (IVersion $a, IVersion $b): int => ($a->getRevisionId() <=> $b->getRevisionId()) *
14+
($a->getSourceFile()->getId() <=> $b->getSourceFile()->getId())]]></code>
15+
</InvalidArgument>
16+
</file>
17+
</files>

β€Žvendor-bin/psalm/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"require-dev": {
3-
"vimeo/psalm": "^5.26"
3+
"vimeo/psalm": "^6"
44
},
55
"config": {
66
"platform": {
7-
"php": "8.1"
7+
"php": "8.1.17"
88
}
99
}
1010
}

0 commit comments

Comments
Β (0)