diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 7201c6d0751b3cc7edde88d60d0ce484ba1cfd44..ca38a4095b74706fe194fcc19738cf2bc112325e 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -78,13 +78,6 @@
<code>run</code>
</InvalidReturnType>
</file>
- <file src="apps/contactsinteraction/lib/Db/CardSearchDao.php">
- <ImplicitToStringCast occurrences="3">
- <code>$propQuery->createFunction($addressbooksQuery->getSQL())</code>
- <code>$cardQuery->createFunction($propQuery->getSQL())</code>
- <code>$cardQuery->createFunction($addressbooksQuery->getSQL())</code>
- </ImplicitToStringCast>
- </file>
<file src="apps/dav/appinfo/v1/caldav.php">
<TooManyArguments occurrences="1">
<code>new \Sabre\DAV\Auth\Plugin($authBackend, 'ownCloud')</code>
@@ -202,16 +195,6 @@
</NullableReturnStatement>
</file>
<file src="apps/dav/lib/CalDAV/CalDavBackend.php">
- <ImplicitToStringCast occurrences="8">
- <code>$query->createParameter('principaluri')</code>
- <code>$query->createNamedParameter(self::ACCESS_PUBLIC)</code>
- <code>$query->createNamedParameter(self::ACCESS_PUBLIC)</code>
- <code>$query->createNamedParameter($value)</code>
- <code>$query->createParameter('uri')</code>
- <code>$outerQuery->createFunction($innerQuery->getSQL())</code>
- <code>$calendarObjectIdQuery->createNamedParameter($componentTypes, IQueryBuilder::PARAM_STR_ARRAY)</code>
- <code>$query->createNamedParameter($matches, IQueryBuilder::PARAM_INT_ARRAY)</code>
- </ImplicitToStringCast>
<InvalidArgument occurrences="14">
<code>'\OCA\DAV\CalDAV\CalDavBackend::createCalendar'</code>
<code>'\OCA\DAV\CalDAV\CalDavBackend::updateCalendar'</code>
@@ -490,11 +473,6 @@
<FalsableReturnStatement occurrences="1">
<code>false</code>
</FalsableReturnStatement>
- <ImplicitToStringCast occurrences="3">
- <code>$query->createParameter('principaluri')</code>
- <code>$query->createParameter('uri')</code>
- <code>$query->createNamedParameter($matches, IQueryBuilder::PARAM_INT_ARRAY)</code>
- </ImplicitToStringCast>
<InvalidArgument occurrences="3">
<code>'\OCA\DAV\CardDAV\CardDavBackend::createCard'</code>
<code>'\OCA\DAV\CardDAV\CardDavBackend::updateCard'</code>
@@ -945,11 +923,6 @@
<code>$this->usersToDelete</code>
</InvalidPropertyAssignmentValue>
</file>
- <file src="apps/dav/lib/Migration/RemoveOrphanEventsAndContacts.php">
- <ImplicitToStringCast occurrences="1">
- <code>$qb->createParameter('ids')</code>
- </ImplicitToStringCast>
- </file>
<file src="apps/dav/lib/RootCollection.php">
<UndefinedPropertyAssignment occurrences="1">
<code>$publicCalendarRoot->disableListing</code>
@@ -1164,25 +1137,6 @@
</TypeDoesNotContainNull>
</file>
<file src="apps/federatedfilesharing/lib/FederatedShareProvider.php">
- <ImplicitToStringCast occurrences="17">
- <code>$qb->createNamedParameter($shareType)</code>
- <code>$qb->createNamedParameter($itemType)</code>
- <code>$qb->createNamedParameter($itemSource)</code>
- <code>$qb->createNamedParameter($itemSource)</code>
- <code>$qb->createNamedParameter($shareWith)</code>
- <code>$qb->createNamedParameter($uidOwner)</code>
- <code>$qb->createNamedParameter($sharedBy)</code>
- <code>$qb->createNamedParameter($permissions)</code>
- <code>$qb->createNamedParameter($token)</code>
- <code>$qb->createNamedParameter(time())</code>
- <code>$qb->createNamedParameter('')</code>
- <code>$qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)</code>
- <code>$qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)</code>
- <code>$qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)</code>
- <code>$qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)</code>
- <code>$qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)</code>
- <code>$qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)</code>
- </ImplicitToStringCast>
<InvalidArrayAccess occurrences="2">
<code>$token</code>
<code>$remoteId</code>
@@ -1278,11 +1232,6 @@
<code>$this</code>
</InvalidScope>
</file>
- <file src="apps/files/lib/Activity/Filter/Favorites.php">
- <ImplicitToStringCast occurrences="1">
- <code>$query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY)</code>
- </ImplicitToStringCast>
- </file>
<file src="apps/files/lib/Activity/Provider.php">
<FalsableReturnStatement occurrences="1">
<code>$this->fileEncrypted[$fileId]</code>
@@ -1439,9 +1388,6 @@
</NullArgument>
</file>
<file src="apps/files_external/lib/Command/Notify.php">
- <ImplicitToStringCast occurrences="1">
- <code>$qb->createNamedParameter($storageIds, IQueryBuilder::PARAM_INT_ARRAY, ':storage_ids')</code>
- </ImplicitToStringCast>
<InvalidArgument occurrences="2">
<code>$input->getArgument('mount_id')</code>
<code>$storage</code>
@@ -1663,18 +1609,6 @@
</TooManyArguments>
</file>
<file src="apps/files_external/lib/Service/DBConfigService.php">
- <ImplicitToStringCast occurrences="10">
- <code>$builder->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)</code>
- <code>$builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)</code>
- <code>$builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)</code>
- <code>$builder->createNamedParameter($value, IQueryBuilder::PARAM_STR)</code>
- <code>$builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)</code>
- <code>$builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)</code>
- <code>$builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR)</code>
- <code>$builder->createNamedParameter($mountId)</code>
- <code>$builder->createNamedParameter($type)</code>
- <code>$builder->createNamedParameter($value)</code>
- </ImplicitToStringCast>
<NullableReturnStatement occurrences="1">
<code>null</code>
</NullableReturnStatement>
@@ -1811,9 +1745,6 @@
</UndefinedInterfaceMethod>
</file>
<file src="apps/files_sharing/lib/External/Manager.php">
- <ImplicitToStringCast occurrences="1">
- <code>$query->createFunction('(' . $select . ')')</code>
- </ImplicitToStringCast>
<InvalidScalarArgument occurrences="1">
<code>(int) $remoteShare</code>
</InvalidScalarArgument>
@@ -1863,11 +1794,6 @@
<code>NotFoundResponse</code>
</InvalidReturnType>
</file>
- <file src="apps/files_sharing/lib/Migration/SetAcceptedStatus.php">
- <ImplicitToStringCast occurrences="1">
- <code>$query->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_USERGROUP], IQueryBuilder::PARAM_INT_ARRAY)</code>
- </ImplicitToStringCast>
- </file>
<file src="apps/files_sharing/lib/Scanner.php">
<InvalidNullableReturnType occurrences="1">
<code>array</code>
@@ -2234,23 +2160,6 @@
</NullableReturnStatement>
</file>
<file src="apps/sharebymail/lib/ShareByMailProvider.php">
- <ImplicitToStringCast occurrences="15">
- <code>$qb->createNamedParameter(IShare::TYPE_EMAIL)</code>
- <code>$qb->createNamedParameter($itemType)</code>
- <code>$qb->createNamedParameter($itemSource)</code>
- <code>$qb->createNamedParameter($itemSource)</code>
- <code>$qb->createNamedParameter($shareWith)</code>
- <code>$qb->createNamedParameter($uidOwner)</code>
- <code>$qb->createNamedParameter($sharedBy)</code>
- <code>$qb->createNamedParameter($permissions)</code>
- <code>$qb->createNamedParameter($token)</code>
- <code>$qb->createNamedParameter($password)</code>
- <code>$qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL)</code>
- <code>$qb->createNamedParameter(time())</code>
- <code>$qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT)</code>
- <code>$qb->createNamedParameter('')</code>
- <code>$qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)</code>
- </ImplicitToStringCast>
<InvalidReturnStatement occurrences="1">
<code>$shares</code>
</InvalidReturnStatement>
@@ -2632,11 +2541,6 @@
<code>bool</code>
</InvalidReturnType>
</file>
- <file src="apps/user_ldap/lib/Mapping/AbstractMapping.php">
- <ImplicitToStringCast occurrences="1">
- <code>$qb->createNamedParameter($fdns, QueryBuilder::PARAM_STR_ARRAY)</code>
- </ImplicitToStringCast>
- </file>
<file src="apps/user_ldap/lib/Proxy.php">
<InvalidDocblock occurrences="1">
<code>protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {</code>
@@ -2751,9 +2655,6 @@
</InvalidReturnType>
</file>
<file src="apps/user_status/lib/Db/UserStatusMapper.php">
- <ImplicitToStringCast occurrences="2">
- <code>$qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)</code>
- </ImplicitToStringCast>
<MoreSpecificImplementedParamType occurrences="1"/>
</file>
<file src="apps/user_status/lib/Service/StatusService.php">
@@ -2815,9 +2716,6 @@
</InvalidReturnType>
</file>
<file src="apps/workflowengine/lib/Manager.php">
- <ImplicitToStringCast occurrences="1">
- <code>$query->createNamedParameter($checkIds, IQueryBuilder::PARAM_INT_ARRAY)</code>
- </ImplicitToStringCast>
<InvalidArgument occurrences="3">
<code>IManager::EVENT_NAME_REG_ENTITY</code>
<code>IManager::EVENT_NAME_REG_OPERATION</code>
@@ -2939,9 +2837,6 @@
</TooManyArguments>
</file>
<file src="core/Command/Db/ConvertType.php">
- <ImplicitToStringCast occurrences="1">
- <code>$insertQuery->createParameter($key)</code>
- </ImplicitToStringCast>
<InternalMethod occurrences="1">
<code>setFilterSchemaAssetsExpression</code>
</InternalMethod>
@@ -3091,11 +2986,6 @@
<code>$this->request->server</code>
</NoInterfaceProperties>
</file>
- <file src="core/Migrations/Version14000Date20180404140050.php">
- <ImplicitToStringCast occurrences="1">
- <code>$qb->func()->lower('uid')</code>
- </ImplicitToStringCast>
- </file>
<file src="core/ajax/update.php">
<InvalidScalarArgument occurrences="12">
<code>0</code>
@@ -3695,9 +3585,6 @@
</NullableReturnStatement>
</file>
<file src="lib/private/DB/Adapter.php">
- <ImplicitToStringCast occurrences="1">
- <code>$builder->createNamedParameter($value)</code>
- </ImplicitToStringCast>
<InvalidReturnStatement occurrences="1">
<code>$builder->execute()</code>
</InvalidReturnStatement>
@@ -3709,9 +3596,6 @@
<FalsableReturnStatement occurrences="1">
<code>$this->conn->fetchColumn('SELECT lastval()')</code>
</FalsableReturnStatement>
- <ImplicitToStringCast occurrences="1">
- <code>$builder->createNamedParameter($value)</code>
- </ImplicitToStringCast>
</file>
<file src="lib/private/DB/Connection.php">
<ImplementedReturnTypeMismatch occurrences="1">
@@ -3813,11 +3697,6 @@
<code>IQueryFunction</code>
</InvalidReturnType>
</file>
- <file src="lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.php">
- <ImplicitToStringCast occurrences="1">
- <code>$this->functionBuilder->lower($x)</code>
- </ImplicitToStringCast>
- </file>
<file src="lib/private/DB/QueryBuilder/QueryBuilder.php">
<InvalidArgument occurrences="1">
<code>$this->connection</code>
@@ -3930,11 +3809,6 @@
</TooManyArguments>
</file>
<file src="lib/private/Files/Cache/Cache.php">
- <ImplicitToStringCast occurrences="3">
- <code>$builder->createNamedParameter($value)</code>
- <code>$fun->md5($newPathFunction)</code>
- <code>$newPathFunction</code>
- </ImplicitToStringCast>
<InvalidArgument occurrences="1">
<code>$parentData</code>
</InvalidArgument>
@@ -3958,11 +3832,6 @@
<code>$entry</code>
</UndefinedInterfaceMethod>
</file>
- <file src="lib/private/Files/Cache/CacheQueryBuilder.php">
- <ImplicitToStringCast occurrences="1">
- <code>$this->createNamedParameter($parents, IQueryBuilder::PARAM_INT_ARRAY)</code>
- </ImplicitToStringCast>
- </file>
<file src="lib/private/Files/Cache/FailedCache.php">
<InvalidReturnStatement occurrences="1">
<code>[]</code>
@@ -4001,13 +3870,6 @@
<code>null</code>
</NullableReturnStatement>
</file>
- <file src="lib/private/Files/Cache/Propagator.php">
- <ImplicitToStringCast occurrences="4">
- <code>$builder->func()->greatest('mtime', $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT))</code>
- <code>$query->createFunction('GREATEST(' . $query->getColumnName('mtime') . ', ' . $query->createParameter('time') . ')')</code>
- <code>$sizeQuery->func()->add('size', $sizeQuery->createParameter('size'))</code>
- </ImplicitToStringCast>
- </file>
<file src="lib/private/Files/Cache/QuerySearchHelper.php">
<InvalidScalarArgument occurrences="4">
<code>$value</code>
@@ -4051,11 +3913,6 @@
<code>self::getGlobalCache()->getStorageInfo($storageId)</code>
</NullableReturnStatement>
</file>
- <file src="lib/private/Files/Cache/StorageGlobal.php">
- <ImplicitToStringCast occurrences="1">
- <code>$builder->createNamedParameter(array_values($storageIds), IQueryBuilder::PARAM_STR_ARRAY)</code>
- </ImplicitToStringCast>
- </file>
<file src="lib/private/Files/Cache/Updater.php">
<RedundantCondition occurrences="1">
<code>$this->cache instanceof Cache</code>
@@ -4122,9 +3979,6 @@
</TypeDoesNotContainType>
</file>
<file src="lib/private/Files/Config/UserMountCache.php">
- <ImplicitToStringCast occurrences="1">
- <code>$builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)</code>
- </ImplicitToStringCast>
<InvalidArgument occurrences="1"/>
<InvalidReturnType occurrences="2">
<code>removeUserStorageMount</code>
@@ -4818,9 +4672,6 @@
</InvalidReturnType>
</file>
<file src="lib/private/Files/Type/Loader.php">
- <ImplicitToStringCast occurrences="1">
- <code>$update->func()->lower('name')</code>
- </ImplicitToStringCast>
<InvalidReturnStatement occurrences="1">
<code>$update->execute()</code>
</InvalidReturnStatement>
@@ -4901,12 +4752,6 @@
</TypeDoesNotContainNull>
</file>
<file src="lib/private/Group/Database.php">
- <ImplicitToStringCast occurrences="4">
- <code>$builder->createNamedParameter($gid)</code>
- <code>$builder->createNamedParameter($gid)</code>
- <code>$qb->createNamedParameter($uid)</code>
- <code>$qb->createNamedParameter($gid)</code>
- </ImplicitToStringCast>
<InvalidArgument occurrences="1"/>
<InvalidArrayOffset occurrences="1">
<code>$this->groupCache[$gid]['displayname']</code>
@@ -5031,13 +4876,6 @@
<code>$data</code>
</InvalidScalarArgument>
</file>
- <file src="lib/private/Lock/DBLockingProvider.php">
- <ImplicitToStringCast occurrences="3">
- <code>$query->func()->subtract('lock', $query->createNamedParameter(1))</code>
- <code>$builder->func()->subtract('lock', $builder->expr()->literal(1))</code>
- <code>$builder->createNamedParameter($chunk, IQueryBuilder::PARAM_STR_ARRAY)</code>
- </ImplicitToStringCast>
- </file>
<file src="lib/private/Lockdown/Filesystem/NullCache.php">
<InvalidNullableReturnType occurrences="1">
<code>get</code>
@@ -5304,14 +5142,8 @@
<code>dispatch</code>
</TooManyArguments>
</file>
- <file src="lib/private/Repair/CleanTags.php">
- <ImplicitToStringCast occurrences="2">
- <code>$query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)</code>
- <code>$qb->createParameter('ids')</code>
- </ImplicitToStringCast>
- </file>
<file src="lib/private/Repair/RemoveLinkShares.php">
- <ImplicitToStringCast occurrences="3">
+ <ImplicitToStringCast occurrences="2">
<code>$subQuery->createFunction('(' . $subSubQuery->getSQL() . ')')</code>
<code>$query->createFunction('(' . $subQuery->getSQL() . ')')</code>
<code>$query->createFunction('(' . $subQuery->getSQL() . ')')</code>
@@ -5326,11 +5158,6 @@
<code>\Doctrine\DBAL\Driver\Statement</code>
</InvalidReturnType>
</file>
- <file src="lib/private/Repair/RepairInvalidShares.php">
- <ImplicitToStringCast occurrences="1">
- <code>$permsFunc</code>
- </ImplicitToStringCast>
- </file>
<file src="lib/private/Repair/RepairMimeTypes.php">
<InvalidOperand occurrences="1">
<code>\OC_DB::executeAudited(self::updateByNameStmt(), [$mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension])</code>
@@ -5364,9 +5191,6 @@
</InvalidPropertyAssignmentValue>
</file>
<file src="lib/private/Security/Bruteforce/Throttler.php">
- <ImplicitToStringCast occurrences="1">
- <code>$qb->createNamedParameter($value)</code>
- </ImplicitToStringCast>
<NullArgument occurrences="1">
<code>null</code>
</NullArgument>
@@ -5492,32 +5316,6 @@
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/Share20/DefaultShareProvider.php">
- <ImplicitToStringCast occurrences="27">
- <code>$qb->createNamedParameter($share->getShareType())</code>
- <code>$qb->createNamedParameter($share->getSharedWith())</code>
- <code>$qb->createNamedParameter(IShare::STATUS_PENDING)</code>
- <code>$qb->createNamedParameter($share->getExpirationDate(), 'datetime')</code>
- <code>$qb->createNamedParameter($share->getSharedWith())</code>
- <code>$qb->createNamedParameter($share->getExpirationDate(), 'datetime')</code>
- <code>$qb->createNamedParameter($share->getLabel())</code>
- <code>$qb->createNamedParameter($share->getToken())</code>
- <code>$qb->createNamedParameter($share->getPassword())</code>
- <code>$qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL)</code>
- <code>$qb->createNamedParameter($share->getExpirationDate(), 'datetime')</code>
- <code>$qb->createNamedParameter($share->getParent())</code>
- <code>$qb->createParameter('itemType')</code>
- <code>$qb->createNamedParameter($share->getNode()->getId())</code>
- <code>$qb->createNamedParameter($share->getNode()->getId())</code>
- <code>$qb->createNamedParameter($share->getPermissions())</code>
- <code>$qb->createNamedParameter($share->getSharedBy())</code>
- <code>$qb->createNamedParameter($share->getShareOwner())</code>
- <code>$qb->createNamedParameter($share->getTarget())</code>
- <code>$qb->createNamedParameter(time())</code>
- <code>$qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)</code>
- <code>$qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)</code>
- <code>$qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)</code>
- <code>$qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)</code>
- </ImplicitToStringCast>
<InvalidReturnStatement occurrences="1">
<code>$shares</code>
</InvalidReturnStatement>
@@ -5634,11 +5432,6 @@
<code>false</code>
<code>false</code>
</FalsableReturnStatement>
- <ImplicitToStringCast occurrences="3">
- <code>$query->createParameter('tagids')</code>
- <code>$query->createParameter('tagids')</code>
- <code>$query->createParameter('tagids')</code>
- </ImplicitToStringCast>
<InvalidArgument occurrences="3">
<code>ManagerEvent::EVENT_CREATE</code>
<code>ManagerEvent::EVENT_UPDATE</code>
@@ -5655,12 +5448,6 @@
</TooManyArguments>
</file>
<file src="lib/private/SystemTag/SystemTagObjectMapper.php">
- <ImplicitToStringCast occurrences="4">
- <code>$query->createParameter('objectids')</code>
- <code>$query->createNamedParameter($tagIds, IQueryBuilder::PARAM_INT_ARRAY)</code>
- <code>$query->createParameter('tagids')</code>
- <code>$query->createParameter('objectids')</code>
- </ImplicitToStringCast>
<InvalidArgument occurrences="2">
<code>MapperEvent::EVENT_ASSIGN</code>
<code>MapperEvent::EVENT_UNASSIGN</code>
@@ -5792,9 +5579,6 @@
<ImplementedReturnTypeMismatch occurrences="1">
<code>array|int</code>
</ImplementedReturnTypeMismatch>
- <ImplicitToStringCast occurrences="1">
- <code>$queryBuilder->createNamedParameter($groups, IQueryBuilder::PARAM_STR_ARRAY)</code>
- </ImplicitToStringCast>
<InvalidNullableReturnType occurrences="1">
<code>bool|IUser</code>
</InvalidNullableReturnType>
@@ -6085,11 +5869,6 @@
<code>$column</code>
</NullableReturnStatement>
</file>
- <file src="lib/public/AppFramework/Db/QBMapper.php">
- <ImplicitToStringCast occurrences="1">
- <code>$qb->createNamedParameter($value, $type)</code>
- </ImplicitToStringCast>
- </file>
<file src="lib/public/AppFramework/Http/DataResponse.php">
<InvalidReturnStatement occurrences="1">
<code>$this->data</code>