Skip to content

Commit 61e0420

Browse files
juliusknorrjuliusknorr
committed
chore: Cleanup psalm baseline
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent 8bf27fd commit 61e0420

File tree

6 files changed

+26
-107
lines changed

6 files changed

+26
-107
lines changed

‎lib/Listeners/BeforeNodeDeletedListener.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ public function handle(Event $event): void {
4545
if (!$event instanceof BeforeNodeDeletedEvent) {
4646
return;
4747
}
48-
if ($event->getNode() instanceof File && $event->getNode()->getMimeType() === 'text/markdown') {
49-
$this->attachmentService->deleteAttachments($event->getNode());
48+
$node = $event->getNode();
49+
if ($node instanceof File && $node->getMimeType() === 'text/markdown') {
50+
$this->attachmentService->deleteAttachments($node);
5051
}
5152
}
5253
}

‎lib/Listeners/BeforeNodeRenamedListener.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@ public function handle(Event $event): void {
4545
if (!$event instanceof BeforeNodeRenamedEvent) {
4646
return;
4747
}
48-
if ($event->getSource() instanceof File
49-
&& $event->getSource()->getMimeType() === 'text/markdown'
50-
&& $event->getTarget() instanceof File
48+
$source = $event->getSource();
49+
$target = $event->getTarget();
50+
if ($source instanceof File
51+
&& $source->getMimeType() === 'text/markdown'
52+
&& $target instanceof File
5153
) {
52-
$this->attachmentService->moveAttachments($event->getSource(), $event->getTarget());
54+
$this->attachmentService->moveAttachments($source, $target);
5355
}
5456
}
5557
}

‎lib/Listeners/NodeCopiedListener.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ public function handle(Event $event): void {
4545
if (!$event instanceof NodeCopiedEvent) {
4646
return;
4747
}
48-
if ($event->getSource() instanceof File
49-
&& $event->getSource()->getMimeType() === 'text/markdown'
50-
&& $event->getTarget() instanceof File
51-
&& $event->getTarget()->getMimeType() === 'text/markdown'
48+
$source = $event->getSource();
49+
$target = $event->getTarget();
50+
if ($source instanceof File
51+
&& $source->getMimeType() === 'text/markdown'
52+
&& $target instanceof File
53+
&& $target->getMimeType() === 'text/markdown'
5254
) {
53-
$this->attachmentService->copyAttachments($event->getSource(), $event->getTarget());
55+
$this->attachmentService->copyAttachments($source, $target);
5456
}
5557
}
5658
}

‎lib/Service/DocumentService.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ public function getFileByShareToken(string $shareToken, ?string $path = null): F
496496
}
497497

498498
$node = $share->getNode();
499-
if ($node instanceof Folder) {
499+
if ($path !== null && $node instanceof Folder) {
500500
$node = $node->get($path);
501501
}
502502
if ($node instanceof File) {

‎tests/psalm-baseline.xml‎

Lines changed: 5 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.x-dev@">
3-
<file src="lib/AppInfo/Application.php">
4-
<InvalidArgument occurrences="1">
5-
<code>RegisterDirectEditorEventListener::class</code>
6-
</InvalidArgument>
7-
<UndefinedClass occurrences="3">
8-
<code>BeforeTemplateRenderedEvent</code>
9-
<code>LoadAdditionalScriptsEvent</code>
10-
<code>LoadViewer</code>
11-
</UndefinedClass>
12-
</file>
13-
<file src="lib/Controller/DirectSessionController.php">
14-
<UndefinedClass occurrences="1">
15-
<code>InvalidTokenException</code>
16-
</UndefinedClass>
17-
</file>
2+
<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176">
183
<file src="lib/Controller/WorkspaceController.php">
19-
<InvalidReturnType occurrences="3">
20-
<code>DataResponse</code>
21-
<code>DataResponse</code>
22-
<code>DataResponse</code>
23-
</InvalidReturnType>
24-
<MissingDependency occurrences="4">
25-
<code>$this-&gt;rootFolder</code>
26-
<code>$this-&gt;rootFolder</code>
27-
<code>IRootFolder</code>
28-
<code>IRootFolder</code>
29-
</MissingDependency>
30-
<UndefinedInterfaceMethod occurrences="1">
4+
<UndefinedInterfaceMethod>
315
<code>open</code>
326
</UndefinedInterfaceMethod>
337
</file>
348
<file src="lib/DAV/WorkspacePlugin.php">
35-
<UndefinedClass occurrences="1">
9+
<UndefinedClass>
3610
<code>ServerPlugin</code>
3711
</UndefinedClass>
3812
</file>
3913
<file src="lib/DirectEditing/TextDirectEditor.php">
40-
<LessSpecificImplementedReturnType occurrences="3">
41-
<code>array</code>
42-
<code>array</code>
43-
<code>array</code>
44-
</LessSpecificImplementedReturnType>
45-
<UndefinedInterfaceMethod occurrences="1">
14+
<UndefinedInterfaceMethod>
4615
<code>getToken</code>
4716
</UndefinedInterfaceMethod>
4817
</file>
49-
<file src="lib/Listeners/FilesLoadAdditionalScriptsListener.php">
50-
<UndefinedClass occurrences="1">
51-
<code>LoadAdditionalScriptsEvent</code>
52-
</UndefinedClass>
53-
</file>
54-
<file src="lib/Listeners/LoadViewerListener.php">
55-
<UndefinedClass occurrences="1">
56-
<code>LoadViewer</code>
57-
</UndefinedClass>
58-
</file>
59-
<file src="lib/Service/ApiService.php">
60-
<UndefinedDocblockClass occurrences="1"/>
61-
</file>
62-
<file src="lib/Service/DocumentService.php">
63-
<MismatchingDocblockReturnType occurrences="1">
64-
<code>Entity</code>
65-
</MismatchingDocblockReturnType>
66-
<MissingDependency occurrences="3">
67-
<code>$this-&gt;rootFolder</code>
68-
<code>IRootFolder</code>
69-
<code>IRootFolder</code>
70-
</MissingDependency>
71-
<UndefinedClass occurrences="1">
72-
<code>\OC\User\NoUserException</code>
73-
</UndefinedClass>
74-
</file>
75-
<file src="lib/Service/AttachmentService.php">
76-
<MissingDependency occurrences="6">
77-
<code>$this-&gt;rootFolder</code>
78-
<code>$this-&gt;rootFolder</code>
79-
<code>$this-&gt;rootFolder</code>
80-
<code>$this-&gt;rootFolder</code>
81-
<code>IRootFolder</code>
82-
<code>IRootFolder</code>
83-
</MissingDependency>
84-
<UndefinedClass occurrences="3">
85-
<code>ClientException</code>
86-
<code>ConnectException</code>
87-
<code>ServerException</code>
88-
</UndefinedClass>
89-
<UndefinedDocblockClass occurrences="16">
90-
<code>\OC\User\NoUserException</code>
91-
<code>\OC\User\NoUserException</code>
92-
<code>\OC\User\NoUserException</code>
93-
<code>\OC\User\NoUserException</code>
94-
<code>\OC\User\NoUserException</code>
95-
<code>\OC\User\NoUserException</code>
96-
<code>\OC\User\NoUserException</code>
97-
<code>\OC\User\NoUserException</code>
98-
<code>\OC\User\NoUserException</code>
99-
<code>\OC\User\NoUserException</code>
100-
<code>\OC\User\NoUserException</code>
101-
<code>\OC\User\NoUserException</code>
102-
<code>\OC\User\NoUserException</code>
103-
<code>\OC\User\NoUserException</code>
104-
<code>\OC\User\NoUserException</code>
105-
<code>\OC\User\NoUserException</code>
106-
</UndefinedDocblockClass>
107-
</file>
10818
<file src="vendor/nextcloud/ocp/OCP/BackgroundJob/TimedJob.php">
109-
<ImplementedParamTypeMismatch occurrences="1">
19+
<ImplementedParamTypeMismatch>
11020
<code>$jobList</code>
11121
</ImplementedParamTypeMismatch>
11222
</file>

‎tests/stub.phpstub‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ namespace OC\AppFramework\OCS {
1010
class BaseResponse {}
1111
}
1212

13+
namespace OCA\Files\Event {
14+
class LoadAdditionalScriptsEvent extends \OCP\EventDispatcher\Event {}
15+
}
16+
1317
namespace OCA\Viewer\Event {
1418
class LoadViewer extends \OCP\EventDispatcher\Event {}
1519
}

0 commit comments

Comments
 (0)