Skip to content

Commit ebf51cf

Browse files
susnuxweb-flow
susnux
and
web-flow
committed
chore(tests): Update psalm baseline
Co-authored-by: GitHub <[email protected]> Signed-off-by: Ferdinand Thiessen <[email protected]>
1 parent 3750072 commit ebf51cf

3 files changed

Lines changed: 25 additions & 66 deletions

File tree

‎build/psalm-baseline.xml‎

Lines changed: 19 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<files psalm-version="5.9.0@8b9ad1eb9e8b7d3101f949291da2b9f7767cd163">
33
<file src="3rdparty/sabre/dav/lib/CalDAV/Calendar.php">
44
<MoreSpecificImplementedParamType>
5-
<code>$calendarData</code>
5+
<code>$data</code>
66
</MoreSpecificImplementedParamType>
77
</file>
88
<file src="3rdparty/sabre/dav/lib/CalDAV/CalendarHome.php">
@@ -17,7 +17,7 @@
1717
</file>
1818
<file src="3rdparty/sabre/dav/lib/CardDAV/AddressBook.php">
1919
<MoreSpecificImplementedParamType>
20-
<code>$vcardData</code>
20+
<code>$data</code>
2121
</MoreSpecificImplementedParamType>
2222
</file>
2323
<file src="3rdparty/sabre/dav/lib/CardDAV/AddressBookHome.php">
@@ -105,11 +105,6 @@
105105
<code>$baseuri</code>
106106
</UndefinedGlobalVariable>
107107
</file>
108-
<file src="apps/dav/lib/AppInfo/Application.php">
109-
<InvalidArgument>
110-
<code>CalendarDeletionDefaultUpdaterListener::class</code>
111-
</InvalidArgument>
112-
</file>
113108
<file src="apps/dav/lib/CalDAV/BirthdayService.php">
114109
<UndefinedMethod>
115110
<code>setDateTime</code>
@@ -122,11 +117,6 @@
122117
<code><![CDATA[$newCalendarData->VEVENT->SUMMARY]]></code>
123118
</UndefinedPropertyFetch>
124119
</file>
125-
<file src="apps/dav/lib/CalDAV/CachedSubscription.php">
126-
<ParamNameMismatch>
127-
<code>$calendarData</code>
128-
</ParamNameMismatch>
129-
</file>
130120
<file src="apps/dav/lib/CalDAV/CachedSubscriptionObject.php">
131121
<NullableReturnStatement>
132122
<code><![CDATA[$this->objectData['calendardata']]]></code>
@@ -153,11 +143,11 @@
153143
<code>VCalendar</code>
154144
</MoreSpecificReturnType>
155145
<NullableReturnStatement>
156-
<code><![CDATA[$this->atomic(function () use ($calendarId, $syncToken, $syncLevel, $limit, $calendarType) {
146+
<code><![CDATA[$this->atomic(function () use ($calendarId, $syncToken, $syncLevel, $limit, $calendarType, $table) {
157147
// Current synctoken
158148
$qb = $this->db->getQueryBuilder();
159149
$qb->select('synctoken')
160-
->from('calendars')
150+
->from($table)
161151
->where(
162152
$qb->expr()->eq('id', $qb->createNamedParameter($calendarId))
163153
);
@@ -439,9 +429,6 @@
439429
</InvalidNullableReturnType>
440430
</file>
441431
<file src="apps/dav/lib/CardDAV/PhotoCache.php">
442-
<InvalidNullableReturnType>
443-
<code>string</code>
444-
</InvalidNullableReturnType>
445432
<LessSpecificReturnStatement>
446433
<code><![CDATA[[
447434
'Content-Type' => $type,
@@ -451,23 +438,12 @@
451438
<MoreSpecificReturnType>
452439
<code>false|array{body: string, Content-Type: string}</code>
453440
</MoreSpecificReturnType>
454-
<NullableReturnStatement>
455-
<code>$type</code>
456-
</NullableReturnStatement>
457441
</file>
458442
<file src="apps/dav/lib/CardDAV/Plugin.php">
459443
<ImplementedReturnTypeMismatch>
460444
<code>string|null</code>
461445
</ImplementedReturnTypeMismatch>
462446
</file>
463-
<file src="apps/dav/lib/CardDAV/SystemAddressbook.php">
464-
<InvalidNullableReturnType>
465-
<code>getChanges</code>
466-
</InvalidNullableReturnType>
467-
<NullableReturnStatement>
468-
<code>null</code>
469-
</NullableReturnStatement>
470-
</file>
471447
<file src="apps/dav/lib/CardDAV/UserAddressBooks.php">
472448
<InvalidArgument>
473449
<code><![CDATA[$this->principalUri]]></code>
@@ -541,7 +517,6 @@
541517
<file src="apps/dav/lib/Connector/Sabre/FilesReportPlugin.php">
542518
<InvalidArgument>
543519
<code>0</code>
544-
<code>200</code>
545520
</InvalidArgument>
546521
<InvalidNullableReturnType>
547522
<code>bool</code>
@@ -1379,9 +1354,6 @@
13791354
</InvalidReturnType>
13801355
</file>
13811356
<file src="apps/settings/lib/AppInfo/Application.php">
1382-
<InvalidArgument>
1383-
<code>AppPasswordCreatedActivityListener::class</code>
1384-
</InvalidArgument>
13851357
<UndefinedInterfaceMethod>
13861358
<code>getSettingsManager</code>
13871359
</UndefinedInterfaceMethod>
@@ -1664,9 +1636,6 @@
16641636
<InvalidReturnType>
16651637
<code>string</code>
16661638
</InvalidReturnType>
1667-
<ParamNameMismatch>
1668-
<code>$uid</code>
1669-
</ParamNameMismatch>
16701639
</file>
16711640
<file src="apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php">
16721641
<MissingTemplateParam>
@@ -1935,7 +1904,6 @@
19351904
</InvalidReturnStatement>
19361905
<InvalidReturnType>
19371906
<code>\OCP\IServerContainer</code>
1938-
<code>mixed</code>
19391907
</InvalidReturnType>
19401908
<UndefinedInterfaceMethod>
19411909
<code>getAppDataDir</code>
@@ -2042,6 +2010,11 @@
20422010
try {
20432011
return $this->query($resolveName);
20442012
} catch (QueryException $e2) {
2013+
// Pass null if typed and nullable
2014+
if ($parameter->allowsNull() && ($parameterType instanceof ReflectionNamedType)) {
2015+
return null;
2016+
}
2017+
20452018
// don't lose the error we got while trying to query by type
20462019
throw new QueryException($e->getMessage(), (int) $e->getCode(), $e);
20472020
}
@@ -2081,15 +2054,6 @@
20812054
<code>$trySession</code>
20822055
</RedundantCondition>
20832056
</file>
2084-
<file src="lib/public/Authentication/Token/IToken.php">
2085-
<AmbiguousConstantInheritance>
2086-
<code>DO_NOT_REMEMBER</code>
2087-
<code>PERMANENT_TOKEN</code>
2088-
<code>REMEMBER</code>
2089-
<code>TEMPORARY_TOKEN</code>
2090-
<code>WIPE_TOKEN</code>
2091-
</AmbiguousConstantInheritance>
2092-
</file>
20932057
<file src="lib/private/Authentication/Token/PublicKeyToken.php">
20942058
<UndefinedMagicMethod>
20952059
<code>getExpires</code>
@@ -2203,16 +2167,8 @@
22032167
</file>
22042168
<file src="lib/private/Command/ClosureJob.php">
22052169
<InvalidArgument>
2206-
<code>[LaravelClosure::class, OpisClosure::class]</code>
2170+
<code>[LaravelClosure::class]</code>
22072171
</InvalidArgument>
2208-
<ParamNameMismatch>
2209-
<code>$serializedCallable</code>
2210-
</ParamNameMismatch>
2211-
</file>
2212-
<file src="lib/private/Command/CommandJob.php">
2213-
<ParamNameMismatch>
2214-
<code>$serializedCommand</code>
2215-
</ParamNameMismatch>
22162172
</file>
22172173
<file src="lib/private/Comments/Manager.php">
22182174
<RedundantCast>
@@ -2868,9 +2824,6 @@
28682824
<LessSpecificReturnStatement>
28692825
<code>$users</code>
28702826
</LessSpecificReturnStatement>
2871-
<MoreSpecificImplementedParamType>
2872-
<code>$user</code>
2873-
</MoreSpecificImplementedParamType>
28742827
<MoreSpecificReturnType>
28752828
<code>\OC\User\User[]</code>
28762829
</MoreSpecificReturnType>
@@ -3155,11 +3108,6 @@
31553108
<code>$out</code>
31563109
</ParamNameMismatch>
31573110
</file>
3158-
<file src="lib/private/Repair/SqliteAutoincrement.php">
3159-
<ParamNameMismatch>
3160-
<code>$out</code>
3161-
</ParamNameMismatch>
3162-
</file>
31633111
<file src="lib/private/Route/Router.php">
31643112
<InvalidClass>
31653113
<code>\OC_APP</code>
@@ -3594,6 +3542,15 @@
35943542
<code>array{X-Request-Id: string, Cache-Control: string, Content-Security-Policy: string, Feature-Policy: string, X-Robots-Tag: string, Last-Modified?: string, ETag?: string, ...H}</code>
35953543
</MoreSpecificReturnType>
35963544
</file>
3545+
<file src="lib/public/Authentication/Token/IToken.php">
3546+
<AmbiguousConstantInheritance>
3547+
<code>DO_NOT_REMEMBER</code>
3548+
<code>PERMANENT_TOKEN</code>
3549+
<code>REMEMBER</code>
3550+
<code>TEMPORARY_TOKEN</code>
3551+
<code>WIPE_TOKEN</code>
3552+
</AmbiguousConstantInheritance>
3553+
</file>
35973554
<file src="lib/public/Cache/CappedMemoryCache.php">
35983555
<MissingTemplateParam>
35993556
<code>\ArrayAccess</code>

‎psalm-ocp.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0"?>
22
<psalm
3+
phpVersion="8.0"
34
errorLevel="4"
45
resolveFromConfigFile="true"
56
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
67
xmlns="https://getpsalm.org/schema/config"
7-
xsi:schemaLocation="https://getpsalm.org/schema/config"
8-
errorBaseline="build/psalm-baseline-ocp.xml"
8+
xsi:schemaLocation="https://getpsalm.org/schema/config vendor-bin/psalm/vendor/vimeo/psalm/config.xsd"
9+
errorBaseline="build/psalm-baseline-ocp.xml"
910
findUnusedBaselineEntry="false"
1011
findUnusedCode="false"
1112
>

‎psalm.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0"?>
22
<psalm
3+
phpVersion="8.0"
34
errorLevel="4"
45
resolveFromConfigFile="true"
56
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
67
xmlns="https://getpsalm.org/schema/config"
7-
xsi:schemaLocation="https://getpsalm.org/schema/config"
8-
errorBaseline="build/psalm-baseline.xml"
8+
xsi:schemaLocation="https://getpsalm.org/schema/config vendor-bin/psalm/vendor/vimeo/psalm/config.xsd"
9+
errorBaseline="build/psalm-baseline.xml"
910
findUnusedBaselineEntry="false"
1011
findUnusedCode="false"
1112
>

0 commit comments

Comments
 (0)