Skip to content

Commit 436a088

Browse files
Merge pull request #37390 from nextcloud/update/psalm-5
Update to psalm 5
2 parents 40b6ce8 + 9fddbea commit 436a088

File tree

6 files changed

+2016
-1285
lines changed

6 files changed

+2016
-1285
lines changed

build/psalm-baseline-ocp.xml

Lines changed: 54 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,152 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
2+
<files psalm-version="5.9.0@8b9ad1eb9e8b7d3101f949291da2b9f7767cd163">
33
<file src="lib/private/legacy/OC_Template.php">
4-
<UndefinedClass occurrences="1">
4+
<UndefinedClass>
55
<code>OC</code>
66
</UndefinedClass>
77
</file>
88
<file src="lib/public/AppFramework/ApiController.php">
9-
<NoInterfaceProperties occurrences="1">
10-
<code>$this-&gt;request-&gt;server</code>
9+
<NoInterfaceProperties>
10+
<code><![CDATA[$this->request->server]]></code>
1111
</NoInterfaceProperties>
1212
</file>
1313
<file src="lib/public/AppFramework/App.php">
14-
<InternalMethod occurrences="1">
15-
<code>new RouteConfig($this-&gt;container, $router, $routes)</code>
14+
<InternalMethod>
15+
<code><![CDATA[new RouteConfig($this->container, $router, $routes)]]></code>
1616
</InternalMethod>
17-
<UndefinedClass occurrences="1">
17+
<UndefinedClass>
1818
<code>\OC</code>
1919
</UndefinedClass>
2020
</file>
2121
<file src="lib/public/AppFramework/Db/Entity.php">
22-
<InvalidNullableReturnType occurrences="1">
22+
<InvalidNullableReturnType>
2323
<code>string</code>
2424
</InvalidNullableReturnType>
25-
<NullableReturnStatement occurrences="1">
25+
<NullableReturnStatement>
2626
<code>$column</code>
2727
</NullableReturnStatement>
2828
</file>
2929
<file src="lib/public/AppFramework/Http/JSONResponse.php">
30-
<InvalidReturnStatement occurrences="1">
31-
<code>$this-&gt;data</code>
30+
<InvalidReturnStatement>
31+
<code><![CDATA[$this->data]]></code>
3232
</InvalidReturnStatement>
33-
<InvalidReturnType occurrences="1">
33+
<InvalidReturnType>
3434
<code>array</code>
3535
</InvalidReturnType>
3636
</file>
3737
<file src="lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php">
38-
<UndefinedClass occurrences="1">
38+
<UndefinedClass>
3939
<code>\OC</code>
4040
</UndefinedClass>
4141
</file>
4242
<file src="lib/public/AppFramework/Http/Response.php">
43-
<UndefinedClass occurrences="2">
43+
<UndefinedClass>
4444
<code>\OC</code>
4545
<code>\OC</code>
4646
</UndefinedClass>
4747
</file>
4848
<file src="lib/public/BackgroundJob/TimedJob.php">
49-
<MoreSpecificImplementedParamType occurrences="1">
49+
<MoreSpecificImplementedParamType>
50+
<code>$jobList</code>
5051
<code>$jobList</code>
5152
</MoreSpecificImplementedParamType>
5253
</file>
54+
<file src="lib/public/Cache/CappedMemoryCache.php">
55+
<MissingTemplateParam>
56+
<code>\ArrayAccess</code>
57+
</MissingTemplateParam>
58+
</file>
5359
<file src="lib/public/Defaults.php">
54-
<UndefinedClass occurrences="1">
60+
<UndefinedClass>
5561
<code>\OC</code>
5662
</UndefinedClass>
5763
</file>
5864
<file src="lib/public/Diagnostics/IQueryLogger.php">
59-
<LessSpecificImplementedReturnType occurrences="1">
65+
<LessSpecificImplementedReturnType>
6066
<code>mixed</code>
6167
</LessSpecificImplementedReturnType>
6268
</file>
69+
<file src="lib/public/EventDispatcher/GenericEvent.php">
70+
<MissingTemplateParam>
71+
<code>ArrayAccess</code>
72+
<code>IteratorAggregate</code>
73+
</MissingTemplateParam>
74+
</file>
6375
<file src="lib/public/Federation/Exceptions/ActionNotSupportedException.php">
64-
<UndefinedClass occurrences="1">
76+
<UndefinedClass>
6577
<code>\OC</code>
6678
</UndefinedClass>
6779
</file>
6880
<file src="lib/public/Federation/Exceptions/AuthenticationFailedException.php">
69-
<UndefinedClass occurrences="1">
81+
<UndefinedClass>
7082
<code>\OC</code>
7183
</UndefinedClass>
7284
</file>
7385
<file src="lib/public/Federation/Exceptions/BadRequestException.php">
74-
<UndefinedClass occurrences="1">
86+
<UndefinedClass>
7587
<code>\OC</code>
7688
</UndefinedClass>
7789
</file>
7890
<file src="lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php">
79-
<UndefinedClass occurrences="1">
91+
<UndefinedClass>
8092
<code>\OC</code>
8193
</UndefinedClass>
8294
</file>
8395
<file src="lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php">
84-
<UndefinedClass occurrences="1">
96+
<UndefinedClass>
8597
<code>\OC</code>
8698
</UndefinedClass>
8799
</file>
88100
<file src="lib/public/Files.php">
89-
<FalsableReturnStatement occurrences="1">
101+
<FalsableReturnStatement>
90102
<code>\OC_App::getStorage($app)</code>
91103
</FalsableReturnStatement>
92-
<UndefinedClass occurrences="1">
104+
<UndefinedClass>
93105
<code>\OC</code>
94106
</UndefinedClass>
95107
</file>
108+
<file src="lib/public/Files/Cache/ICacheEntry.php">
109+
<MissingTemplateParam>
110+
<code>ArrayAccess</code>
111+
</MissingTemplateParam>
112+
</file>
96113
<file src="lib/public/Files/LockNotAcquiredException.php">
97-
<UndefinedClass occurrences="1">
114+
<UndefinedClass>
98115
<code>\OC</code>
99116
</UndefinedClass>
100117
</file>
101118
<file src="lib/public/Files/StorageAuthException.php">
102-
<UndefinedClass occurrences="1">
119+
<UndefinedClass>
103120
<code>\OC</code>
104121
</UndefinedClass>
105122
</file>
106123
<file src="lib/public/Files/StorageBadConfigException.php">
107-
<UndefinedClass occurrences="1">
124+
<UndefinedClass>
108125
<code>\OC</code>
109126
</UndefinedClass>
110127
</file>
111128
<file src="lib/public/Files/StorageConnectionException.php">
112-
<UndefinedClass occurrences="1">
129+
<UndefinedClass>
113130
<code>\OC</code>
114131
</UndefinedClass>
115132
</file>
116133
<file src="lib/public/Files/StorageNotAvailableException.php">
117-
<UndefinedClass occurrences="1">
134+
<UndefinedClass>
118135
<code>\OC</code>
119136
</UndefinedClass>
120137
</file>
121138
<file src="lib/public/Files/StorageTimeoutException.php">
122-
<UndefinedClass occurrences="1">
139+
<UndefinedClass>
123140
<code>\OC</code>
124141
</UndefinedClass>
125142
</file>
143+
<file src="lib/public/L10N/ILanguageIterator.php">
144+
<MissingTemplateParam>
145+
<code>\Iterator</code>
146+
</MissingTemplateParam>
147+
</file>
126148
<file src="lib/public/Template.php">
127-
<UndefinedFunction occurrences="7">
149+
<UndefinedFunction>
128150
<code>\html_select_options($options, $selected, $params)</code>
129151
<code>\human_file_size($bytes)</code>
130152
<code>\image_path($app, $image)</code>
@@ -135,7 +157,7 @@
135157
</UndefinedFunction>
136158
</file>
137159
<file src="lib/public/Util.php">
138-
<UndefinedClass occurrences="14">
160+
<UndefinedClass>
139161
<code>\OC</code>
140162
<code>\OC</code>
141163
<code>\OC</code>

0 commit comments

Comments
 (0)