Skip to content

Commit b71049b

Browse files
Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
1 parent 2255a7a commit b71049b

File tree

1 file changed

+3
-170
lines changed

1 file changed

+3
-170
lines changed

build/psalm-baseline.xml

Lines changed: 3 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<files psalm-version="5.9.0@8b9ad1eb9e8b7d3101f949291da2b9f7767cd163">
33
<file src="3rdparty/sabre/dav/lib/CalDAV/Calendar.php">
4-
<MoreSpecificImplementedParamType>
5-
<code>$calendarData</code>
6-
</MoreSpecificImplementedParamType>
4+
<MoreSpecificImplementedParamType/>
75
</file>
86
<file src="3rdparty/sabre/dav/lib/CalDAV/CalendarHome.php">
97
<MoreSpecificImplementedParamType>
@@ -16,9 +14,7 @@
1614
</MoreSpecificImplementedParamType>
1715
</file>
1816
<file src="3rdparty/sabre/dav/lib/CardDAV/AddressBook.php">
19-
<MoreSpecificImplementedParamType>
20-
<code>$vcardData</code>
21-
</MoreSpecificImplementedParamType>
17+
<MoreSpecificImplementedParamType/>
2218
</file>
2319
<file src="3rdparty/sabre/dav/lib/CardDAV/AddressBookHome.php">
2420
<InvalidPropertyAssignmentValue>
@@ -105,11 +101,6 @@
105101
<code>$baseuri</code>
106102
</UndefinedGlobalVariable>
107103
</file>
108-
<file src="apps/dav/lib/AppInfo/Application.php">
109-
<InvalidArgument>
110-
<code>CalendarDeletionDefaultUpdaterListener::class</code>
111-
</InvalidArgument>
112-
</file>
113104
<file src="apps/dav/lib/CalDAV/BirthdayService.php">
114105
<UndefinedMethod>
115106
<code>setDateTime</code>
@@ -122,11 +113,6 @@
122113
<code><![CDATA[$newCalendarData->VEVENT->SUMMARY]]></code>
123114
</UndefinedPropertyFetch>
124115
</file>
125-
<file src="apps/dav/lib/CalDAV/CachedSubscription.php">
126-
<ParamNameMismatch>
127-
<code>$calendarData</code>
128-
</ParamNameMismatch>
129-
</file>
130116
<file src="apps/dav/lib/CalDAV/CachedSubscriptionObject.php">
131117
<NullableReturnStatement>
132118
<code><![CDATA[$this->objectData['calendardata']]]></code>
@@ -153,86 +139,6 @@
153139
<code>VCalendar</code>
154140
</MoreSpecificReturnType>
155141
<NullableReturnStatement>
156-
<code><![CDATA[$this->atomic(function () use ($calendarId, $syncToken, $syncLevel, $limit, $calendarType) {
157-
// Current synctoken
158-
$qb = $this->db->getQueryBuilder();
159-
$qb->select('synctoken')
160-
->from('calendars')
161-
->where(
162-
$qb->expr()->eq('id', $qb->createNamedParameter($calendarId))
163-
);
164-
$stmt = $qb->executeQuery();
165-
$currentToken = $stmt->fetchOne();
166-
167-
if ($currentToken === false) {
168-
return null;
169-
}
170-
171-
$result = [
172-
'syncToken' => $currentToken,
173-
'added' => [],
174-
'modified' => [],
175-
'deleted' => [],
176-
];
177-
178-
if ($syncToken) {
179-
$qb = $this->db->getQueryBuilder();
180-
181-
$qb->select('uri', 'operation')
182-
->from('calendarchanges')
183-
->where(
184-
$qb->expr()->andX(
185-
$qb->expr()->gte('synctoken', $qb->createNamedParameter($syncToken)),
186-
$qb->expr()->lt('synctoken', $qb->createNamedParameter($currentToken)),
187-
$qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId)),
188-
$qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType))
189-
)
190-
)->orderBy('synctoken');
191-
if (is_int($limit) && $limit > 0) {
192-
$qb->setMaxResults($limit);
193-
}
194-
195-
// Fetching all changes
196-
$stmt = $qb->executeQuery();
197-
$changes = [];
198-
199-
// This loop ensures that any duplicates are overwritten, only the
200-
// last change on a node is relevant.
201-
while ($row = $stmt->fetch()) {
202-
$changes[$row['uri']] = $row['operation'];
203-
}
204-
$stmt->closeCursor();
205-
206-
foreach ($changes as $uri => $operation) {
207-
switch ($operation) {
208-
case 1:
209-
$result['added'][] = $uri;
210-
break;
211-
case 2:
212-
$result['modified'][] = $uri;
213-
break;
214-
case 3:
215-
$result['deleted'][] = $uri;
216-
break;
217-
}
218-
}
219-
} else {
220-
// No synctoken supplied, this is the initial sync.
221-
$qb = $this->db->getQueryBuilder();
222-
$qb->select('uri')
223-
->from('calendarobjects')
224-
->where(
225-
$qb->expr()->andX(
226-
$qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId)),
227-
$qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType))
228-
)
229-
);
230-
$stmt = $qb->executeQuery();
231-
$result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
232-
$stmt->closeCursor();
233-
}
234-
return $result;
235-
}, $this->db)]]></code>
236142
<code>null</code>
237143
</NullableReturnStatement>
238144
</file>
@@ -439,9 +345,6 @@
439345
</InvalidNullableReturnType>
440346
</file>
441347
<file src="apps/dav/lib/CardDAV/PhotoCache.php">
442-
<InvalidNullableReturnType>
443-
<code>string</code>
444-
</InvalidNullableReturnType>
445348
<LessSpecificReturnStatement>
446349
<code><![CDATA[[
447350
'Content-Type' => $type,
@@ -451,23 +354,12 @@
451354
<MoreSpecificReturnType>
452355
<code>false|array{body: string, Content-Type: string}</code>
453356
</MoreSpecificReturnType>
454-
<NullableReturnStatement>
455-
<code>$type</code>
456-
</NullableReturnStatement>
457357
</file>
458358
<file src="apps/dav/lib/CardDAV/Plugin.php">
459359
<ImplementedReturnTypeMismatch>
460360
<code>string|null</code>
461361
</ImplementedReturnTypeMismatch>
462362
</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>
471363
<file src="apps/dav/lib/CardDAV/UserAddressBooks.php">
472364
<InvalidArgument>
473365
<code><![CDATA[$this->principalUri]]></code>
@@ -541,7 +433,6 @@
541433
<file src="apps/dav/lib/Connector/Sabre/FilesReportPlugin.php">
542434
<InvalidArgument>
543435
<code>0</code>
544-
<code>200</code>
545436
</InvalidArgument>
546437
<InvalidNullableReturnType>
547438
<code>bool</code>
@@ -1378,9 +1269,6 @@
13781269
</InvalidReturnType>
13791270
</file>
13801271
<file src="apps/settings/lib/AppInfo/Application.php">
1381-
<InvalidArgument>
1382-
<code>AppPasswordCreatedActivityListener::class</code>
1383-
</InvalidArgument>
13841272
<UndefinedInterfaceMethod>
13851273
<code>getSettingsManager</code>
13861274
</UndefinedInterfaceMethod>
@@ -1663,9 +1551,6 @@
16631551
<InvalidReturnType>
16641552
<code>string</code>
16651553
</InvalidReturnType>
1666-
<ParamNameMismatch>
1667-
<code>$uid</code>
1668-
</ParamNameMismatch>
16691554
</file>
16701555
<file src="apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php">
16711556
<MissingTemplateParam>
@@ -1934,7 +1819,6 @@
19341819
</InvalidReturnStatement>
19351820
<InvalidReturnType>
19361821
<code>\OCP\IServerContainer</code>
1937-
<code>mixed</code>
19381822
</InvalidReturnType>
19391823
<UndefinedInterfaceMethod>
19401824
<code>getAppDataDir</code>
@@ -2016,39 +1900,6 @@
20161900
<file src="lib/private/AppFramework/Utility/SimpleContainer.php">
20171901
<LessSpecificReturnStatement>
20181902
<code><![CDATA[$class->newInstance()]]></code>
2019-
<code><![CDATA[$class->newInstanceArgs(array_map(function (ReflectionParameter $parameter) {
2020-
$parameterType = $parameter->getType();
2021-
2022-
$resolveName = $parameter->getName();
2023-
2024-
// try to find out if it is a class or a simple parameter
2025-
if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) {
2026-
$resolveName = $parameterType->getName();
2027-
}
2028-
2029-
try {
2030-
$builtIn = $parameter->hasType() && ($parameter->getType() instanceof ReflectionNamedType)
2031-
&& $parameter->getType()->isBuiltin();
2032-
return $this->query($resolveName, !$builtIn);
2033-
} catch (QueryException $e) {
2034-
// Service not found, use the default value when available
2035-
if ($parameter->isDefaultValueAvailable()) {
2036-
return $parameter->getDefaultValue();
2037-
}
2038-
2039-
if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) {
2040-
$resolveName = $parameter->getName();
2041-
try {
2042-
return $this->query($resolveName);
2043-
} catch (QueryException $e2) {
2044-
// don't lose the error we got while trying to query by type
2045-
throw new QueryException($e->getMessage(), (int) $e->getCode(), $e);
2046-
}
2047-
}
2048-
2049-
throw $e;
2050-
}
2051-
}, $constructor->getParameters()))]]></code>
20521903
</LessSpecificReturnStatement>
20531904
<MissingTemplateParam>
20541905
<code>ArrayAccess</code>
@@ -2201,17 +2052,7 @@
22012052
</ParamNameMismatch>
22022053
</file>
22032054
<file src="lib/private/Command/ClosureJob.php">
2204-
<InvalidArgument>
2205-
<code>[LaravelClosure::class, OpisClosure::class]</code>
2206-
</InvalidArgument>
2207-
<ParamNameMismatch>
2208-
<code>$serializedCallable</code>
2209-
</ParamNameMismatch>
2210-
</file>
2211-
<file src="lib/private/Command/CommandJob.php">
2212-
<ParamNameMismatch>
2213-
<code>$serializedCommand</code>
2214-
</ParamNameMismatch>
2055+
<InvalidArgument/>
22152056
</file>
22162057
<file src="lib/private/Comments/Manager.php">
22172058
<RedundantCast>
@@ -2867,9 +2708,6 @@
28672708
<LessSpecificReturnStatement>
28682709
<code>$users</code>
28692710
</LessSpecificReturnStatement>
2870-
<MoreSpecificImplementedParamType>
2871-
<code>$user</code>
2872-
</MoreSpecificImplementedParamType>
28732711
<MoreSpecificReturnType>
28742712
<code>\OC\User\User[]</code>
28752713
</MoreSpecificReturnType>
@@ -3154,11 +2992,6 @@
31542992
<code>$out</code>
31552993
</ParamNameMismatch>
31562994
</file>
3157-
<file src="lib/private/Repair/SqliteAutoincrement.php">
3158-
<ParamNameMismatch>
3159-
<code>$out</code>
3160-
</ParamNameMismatch>
3161-
</file>
31622995
<file src="lib/private/Route/Router.php">
31632996
<InvalidClass>
31642997
<code>\OC_APP</code>

0 commit comments

Comments
 (0)