diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index c7190ff27db03..b267c8dc84e9c 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -2,7 +2,7 @@ - $calendarData + $data @@ -17,7 +17,7 @@ - $vcardData + $data @@ -105,11 +105,6 @@ $baseuri - - - CalendarDeletionDefaultUpdaterListener::class - - setDateTime @@ -122,11 +117,6 @@ VEVENT->SUMMARY]]> - - - $calendarData - - objectData['calendardata']]]> @@ -153,11 +143,11 @@ VCalendar - atomic(function () use ($calendarId, $syncToken, $syncLevel, $limit, $calendarType) { + 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 @@ - - string - $type, @@ -451,23 +438,12 @@ false|array{body: string, Content-Type: string} - - $type - string|null - - - getChanges - - - null - - principalUri]]> @@ -541,7 +517,6 @@ 0 - 200 bool @@ -1379,9 +1354,6 @@ - - AppPasswordCreatedActivityListener::class - getSettingsManager @@ -1664,9 +1636,6 @@ string - - $uid - @@ -1935,7 +1904,6 @@ \OCP\IServerContainer - mixed getAppDataDir @@ -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 @@ $trySession - - - DO_NOT_REMEMBER - PERMANENT_TOKEN - REMEMBER - TEMPORARY_TOKEN - WIPE_TOKEN - - getExpires @@ -2203,16 +2167,8 @@ - [LaravelClosure::class, OpisClosure::class] + [LaravelClosure::class] - - $serializedCallable - - - - - $serializedCommand - @@ -2868,9 +2824,6 @@ $users - - $user - \OC\User\User[] @@ -3155,11 +3108,6 @@ $out - - - $out - - \OC_APP @@ -3594,6 +3542,15 @@ 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} + + + DO_NOT_REMEMBER + PERMANENT_TOKEN + REMEMBER + TEMPORARY_TOKEN + WIPE_TOKEN + + \ArrayAccess diff --git a/psalm-ocp.xml b/psalm-ocp.xml index e5cef0a28b028..0e6399377c184 100644 --- a/psalm-ocp.xml +++ b/psalm-ocp.xml @@ -1,11 +1,12 @@ diff --git a/psalm.xml b/psalm.xml index 4f7c479a15226..bc1e62998ab6b 100644 --- a/psalm.xml +++ b/psalm.xml @@ -1,11 +1,12 @@