chore(tests): Update psalm baseline

Co-authored-by: GitHub <noreply@github.com>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

1 files changed, 19 insertions, 62 deletions

diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index c7190ff27db..b267c8dc84e 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -2,7 +2,7 @@
 <files psalm-version="5.9.0@8b9ad1eb9e8b7d3101f949291da2b9f7767cd163">
   <file src="3rdparty/sabre/dav/lib/CalDAV/Calendar.php">
     <MoreSpecificImplementedParamType>
-      <code>$calendarData</code>
+      <code>$data</code>
     </MoreSpecificImplementedParamType>
   </file>
   <file src="3rdparty/sabre/dav/lib/CalDAV/CalendarHome.php">
@@ -17,7 +17,7 @@
   </file>
   <file src="3rdparty/sabre/dav/lib/CardDAV/AddressBook.php">
     <MoreSpecificImplementedParamType>
-      <code>$vcardData</code>
+      <code>$data</code>
     </MoreSpecificImplementedParamType>
   </file>
   <file src="3rdparty/sabre/dav/lib/CardDAV/AddressBookHome.php">
@@ -105,11 +105,6 @@
       <code>$baseuri</code>
     </UndefinedGlobalVariable>
   </file>
-  <file src="apps/dav/lib/AppInfo/Application.php">
-    <InvalidArgument>
-      <code>CalendarDeletionDefaultUpdaterListener::class</code>
-    </InvalidArgument>
-  </file>
   <file src="apps/dav/lib/CalDAV/BirthdayService.php">
     <UndefinedMethod>
       <code>setDateTime</code>
@@ -122,11 +117,6 @@
       <code><![CDATA[$newCalendarData->VEVENT->SUMMARY]]></code>
     </UndefinedPropertyFetch>
   </file>
-  <file src="apps/dav/lib/CalDAV/CachedSubscription.php">
-    <ParamNameMismatch>
-      <code>$calendarData</code>
-    </ParamNameMismatch>
-  </file>
   <file src="apps/dav/lib/CalDAV/CachedSubscriptionObject.php">
     <NullableReturnStatement>
       <code><![CDATA[$this->objectData['calendardata']]]></code>
@@ -153,11 +143,11 @@
       <code>VCalendar</code>
     </MoreSpecificReturnType>
     <NullableReturnStatement>
-      <code><![CDATA[$this->atomic(function () use ($calendarId, $syncToken, $syncLevel, $limit, $calendarType) {
+      <code><![CDATA[$this->atomic(function () use ($calendarId, $syncToken, $syncLevel, $limit, $calendarType, $table) {
 			// Current synctoken
 			$qb = $this->db->getQueryBuilder();
 			$qb->select('synctoken')
-				->from('calendars')
+				->from($table)
 				->where(
 					$qb->expr()->eq('id', $qb->createNamedParameter($calendarId))
 				);
@@ -439,9 +429,6 @@
     </InvalidNullableReturnType>
   </file>
   <file src="apps/dav/lib/CardDAV/PhotoCache.php">
-    <InvalidNullableReturnType>
-      <code>string</code>
-    </InvalidNullableReturnType>
     <LessSpecificReturnStatement>
       <code><![CDATA[[
 				'Content-Type' => $type,
@@ -451,23 +438,12 @@
     <MoreSpecificReturnType>
       <code>false|array{body: string, Content-Type: string}</code>
     </MoreSpecificReturnType>
-    <NullableReturnStatement>
-      <code>$type</code>
-    </NullableReturnStatement>
   </file>
   <file src="apps/dav/lib/CardDAV/Plugin.php">
     <ImplementedReturnTypeMismatch>
       <code>string|null</code>
     </ImplementedReturnTypeMismatch>
   </file>
-  <file src="apps/dav/lib/CardDAV/SystemAddressbook.php">
-    <InvalidNullableReturnType>
-      <code>getChanges</code>
-    </InvalidNullableReturnType>
-    <NullableReturnStatement>
-      <code>null</code>
-    </NullableReturnStatement>
-  </file>
   <file src="apps/dav/lib/CardDAV/UserAddressBooks.php">
     <InvalidArgument>
       <code><![CDATA[$this->principalUri]]></code>
@@ -541,7 +517,6 @@
   <file src="apps/dav/lib/Connector/Sabre/FilesReportPlugin.php">
     <InvalidArgument>
       <code>0</code>
-      <code>200</code>
     </InvalidArgument>
     <InvalidNullableReturnType>
       <code>bool</code>
@@ -1379,9 +1354,6 @@
     </InvalidReturnType>
   </file>
   <file src="apps/settings/lib/AppInfo/Application.php">
-    <InvalidArgument>
-      <code>AppPasswordCreatedActivityListener::class</code>
-    </InvalidArgument>
     <UndefinedInterfaceMethod>
       <code>getSettingsManager</code>
     </UndefinedInterfaceMethod>
@@ -1664,9 +1636,6 @@
     <InvalidReturnType>
       <code>string</code>
     </InvalidReturnType>
-    <ParamNameMismatch>
-      <code>$uid</code>
-    </ParamNameMismatch>
   </file>
   <file src="apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php">
     <MissingTemplateParam>
@@ -1935,7 +1904,6 @@
     </InvalidReturnStatement>
     <InvalidReturnType>
       <code>\OCP\IServerContainer</code>
-      <code>mixed</code>
     </InvalidReturnType>
     <UndefinedInterfaceMethod>
       <code>getAppDataDir</code>
@@ -2042,6 +2010,11 @@
 					try {
 						return $this->query($resolveName);
 					} catch (QueryException $e2) {
+						// Pass null if typed and nullable
+						if ($parameter->allowsNull() && ($parameterType instanceof ReflectionNamedType)) {
+							return null;
+						}
+
 						// don't lose the error we got while trying to query by type
 						throw new QueryException($e->getMessage(), (int) $e->getCode(), $e);
 					}
@@ -2081,15 +2054,6 @@
       <code>$trySession</code>
     </RedundantCondition>
   </file>
-  <file src="lib/public/Authentication/Token/IToken.php">
-    <AmbiguousConstantInheritance>
-      <code>DO_NOT_REMEMBER</code>
-      <code>PERMANENT_TOKEN</code>
-      <code>REMEMBER</code>
-      <code>TEMPORARY_TOKEN</code>
-      <code>WIPE_TOKEN</code>
-    </AmbiguousConstantInheritance>
-  </file>
   <file src="lib/private/Authentication/Token/PublicKeyToken.php">
     <UndefinedMagicMethod>
       <code>getExpires</code>
@@ -2203,16 +2167,8 @@
   </file>
   <file src="lib/private/Command/ClosureJob.php">
     <InvalidArgument>
-      <code>[LaravelClosure::class, OpisClosure::class]</code>
+      <code>[LaravelClosure::class]</code>
     </InvalidArgument>
-    <ParamNameMismatch>
-      <code>$serializedCallable</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="lib/private/Command/CommandJob.php">
-    <ParamNameMismatch>
-      <code>$serializedCommand</code>
-    </ParamNameMismatch>
   </file>
   <file src="lib/private/Comments/Manager.php">
     <RedundantCast>
@@ -2868,9 +2824,6 @@
     <LessSpecificReturnStatement>
       <code>$users</code>
     </LessSpecificReturnStatement>
-    <MoreSpecificImplementedParamType>
-      <code>$user</code>
-    </MoreSpecificImplementedParamType>
     <MoreSpecificReturnType>
       <code>\OC\User\User[]</code>
     </MoreSpecificReturnType>
@@ -3155,11 +3108,6 @@
       <code>$out</code>
     </ParamNameMismatch>
   </file>
-  <file src="lib/private/Repair/SqliteAutoincrement.php">
-    <ParamNameMismatch>
-      <code>$out</code>
-    </ParamNameMismatch>
-  </file>
   <file src="lib/private/Route/Router.php">
     <InvalidClass>
       <code>\OC_APP</code>
@@ -3594,6 +3542,15 @@
       <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>
     </MoreSpecificReturnType>
   </file>
+  <file src="lib/public/Authentication/Token/IToken.php">
+    <AmbiguousConstantInheritance>
+      <code>DO_NOT_REMEMBER</code>
+      <code>PERMANENT_TOKEN</code>
+      <code>REMEMBER</code>
+      <code>TEMPORARY_TOKEN</code>
+      <code>WIPE_TOKEN</code>
+    </AmbiguousConstantInheritance>
+  </file>
   <file src="lib/public/Cache/CappedMemoryCache.php">
     <MissingTemplateParam>
       <code>\ArrayAccess</code>