From 2c40d2cf456d147e9062c38a1326a01b7f8366e7 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Wed, 14 Oct 2020 11:47:54 +0200 Subject: [PATCH] Bump vimeo/psalm from 3.15 to 3.17.1 Signed-off-by: Christoph Wurst --- build/psalm-baseline.xml | 1232 ++++++++++++++++++-------------------- composer.json | 2 +- composer.lock | 13 +- 3 files changed, 594 insertions(+), 653 deletions(-) diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index e01a544b39..db51bec66e 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1,5 +1,5 @@ - + string|null @@ -54,7 +54,11 @@ $e->getCode() - + + is_array($notification) + + + !is_array($notification) is_array($notification) @@ -73,6 +77,11 @@ \Sabre\Uri\split($this->principalUri) + + + ?string + + new \Sabre\DAV\Auth\Plugin($authBackend, 'ownCloud') @@ -91,8 +100,8 @@ - \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false) \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog) + \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false) $baseuri @@ -154,10 +163,10 @@ setDateTime - $newCalendarData->VEVENT->DTSTART $existingBirthday->VEVENT->DTSTART - $newCalendarData->VEVENT->SUMMARY $existingBirthday->VEVENT->SUMMARY + $newCalendarData->VEVENT->DTSTART + $newCalendarData->VEVENT->SUMMARY @@ -181,20 +190,20 @@ - '\OCA\DAV\CalDAV\CalDavBackend::createCalendar' - '\OCA\DAV\CalDAV\CalDavBackend::updateCalendar' - '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar' - '\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject' '\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject' - '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject' - '\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject' - '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject' - '\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject' + '\OCA\DAV\CalDAV\CalDavBackend::createCalendar' + '\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject' '\OCA\DAV\CalDAV\CalDavBackend::createSubscription' - '\OCA\DAV\CalDAV\CalDavBackend::updateSubscription' + '\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject' + '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar' + '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject' '\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription' - '\OCA\DAV\CalDAV\CalDavBackend::updateShares' '\OCA\DAV\CalDAV\CalDavBackend::publishCalendar' + '\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject' + '\OCA\DAV\CalDAV\CalDavBackend::updateCalendar' + '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject' + '\OCA\DAV\CalDAV\CalDavBackend::updateShares' + '\OCA\DAV\CalDAV\CalDavBackend::updateSubscription' array @@ -218,18 +227,18 @@ dispatch dispatch dispatch + dispatch + dispatch + dispatch + dispatch + dispatch purgeProperties - dispatch - dispatch - dispatch - dispatch - dispatch - Uri\split($row['principaluri']) - Uri\split($row['principaluri']) - Uri\split($row['principaluri']) Uri\split($principalUri) + Uri\split($row['principaluri']) + Uri\split($row['principaluri']) + Uri\split($row['principaluri']) @@ -242,11 +251,11 @@ \Sabre\CalDAv\Notifications\Collection + $calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri) new Inbox($this->caldavBackend, $this->principalInfo['uri']) new Outbox($this->config, $this->principalInfo['uri']) - new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']) new Subscription($this->caldavBackend, $subscription) - $calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri) + new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']) getChild @@ -278,26 +287,32 @@ $paths + + + $canPublish + $canShare + + - isFloating hasTime isFloating + isFloating - $l10n->l('weekdayName', $dt, ['width' => 'abbreviated']) $l10n->l('date', $dt, ['width' => 'medium']) $l10n->l('datetime', $dt, ['width' => 'medium|short']) $l10n->l('time', $dt, ['width' => 'short']) + $l10n->l('weekdayName', $dt, ['width' => 'abbreviated']) - [$organizerEMail => $name] - $l10n->l('weekdayName', $dt, ['width' => 'abbreviated']) $l10n->l('date', $dt, ['width' => 'medium']) $l10n->l('datetime', $dt, ['width' => 'medium|short']) $l10n->l('time', $dt, ['width' => 'short']) + $l10n->l('weekdayName', $dt, ['width' => 'abbreviated']) + [$organizerEMail => $name] array|null @@ -308,22 +323,22 @@ getDateTime - isFloating getDateTime + isFloating - $this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']) $this->l10n->l('date', $dt, ['width' => 'medium']) $this->l10n->l('datetime', $dt, ['width' => 'medium|short']) $this->l10n->l('time', $dt, ['width' => 'short']) + $this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']) - $this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']) $this->l10n->l('date', $dt, ['width' => 'medium']) $this->l10n->l('datetime', $dt, ['width' => 'medium|short']) $this->l10n->l('time', $dt, ['width' => 'short']) + $this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']) string @@ -365,33 +380,36 @@ - + + $vevent->LOCATION + $vevent->SUMMARY + string - [$sender => $senderName] [$recipient => $recipientName] + [$sender => $senderName] $lang->getValue() - isFloating getDateTime - setDateTime - hasTime - isFloating getDateTime - setDateTime + getDateTime + getDateTime + getDateTime getDateTime getDateTime getDateTime hasTime - getDateTime - getDateTime - getDateTime + hasTime isFloating + isFloating + isFloating + setDateTime + setDateTime $iTipMessage->message->VEVENT->SUMMARY @@ -406,14 +424,14 @@ split($principalUrl) - getChildren get + getChildren getDateTime - isFloating hasTime isFloating + isFloating principalSearch @@ -429,10 +447,13 @@ - + + !is_array($newProps['filters']['comps']) + !is_array($newProps['filters']['params']) + !is_array($newProps['filters']['props']) is_array($newProps['filters']['comps']) - is_array($newProps['filters']['props']) is_array($newProps['filters']['params']) + is_array($newProps['filters']['props']) @@ -460,8 +481,8 @@ '\OCA\DAV\CardDAV\CardDavBackend::createCard' - '\OCA\DAV\CardDAV\CardDavBackend::updateCard' '\OCA\DAV\CardDAV\CardDavBackend::deleteCard' + '\OCA\DAV\CardDAV\CardDavBackend::updateCard' array @@ -481,8 +502,8 @@ $addressBooks[$row['id']][$readOnlyPropertyName] === 0 - \Sabre\Uri\split($row['principaluri']) \Sabre\Uri\split($principalUri) + \Sabre\Uri\split($row['principaluri']) @@ -521,7 +542,7 @@ - $shareEnumeration && $restrictShareEnumeration + $shareEnumeration @@ -561,7 +582,11 @@ - + + is_string($name) + + + !is_string($name) is_string($name) @@ -660,9 +685,9 @@ - \Sabre\Uri\split($source) \Sabre\Uri\split($destination) \Sabre\Uri\split($filePath) + \Sabre\Uri\split($source) @@ -683,8 +708,8 @@ \OCA\Circles\Api\v1\Circles - getPath getById + getPath @@ -700,15 +725,15 @@ $this->info->getId() - \Sabre\Uri\split($this->path) \Sabre\Uri\split($name) + \Sabre\Uri\split($this->path) + \Sabre\Uri\split($destinationPath) + \Sabre\Uri\split($destinationPath) \Sabre\Uri\split($path) - \Sabre\Uri\split($destinationPath) - \Sabre\Uri\split($destinationPath) @@ -722,7 +747,6 @@ string[] - null $this->circleToPrincipal($name) null null @@ -731,6 +755,7 @@ null null null + null \OCA\Circles\Api\v1\Circles @@ -780,9 +805,9 @@ getId getId - getPath - getPath getId + getPath + getPath $server->xml->namespacesMap @@ -871,8 +896,8 @@ - $operator->arguments $argument + $operator->arguments $value @@ -927,12 +952,12 @@ getDateTime getDateTime - isFloating getDateTime - setDateTime + getDateTime hasTime isFloating - getDateTime + isFloating + setDateTime setDateTime @@ -945,8 +970,8 @@ - 'OCA\DAV\Connector\Sabre::authInit' 'OCA\DAV\Connector\Sabre::addPlugin' + 'OCA\DAV\Connector\Sabre::authInit' dispatch @@ -994,15 +1019,15 @@ $members + \Sabre\Uri\split($member) \Sabre\Uri\split($principal) \Sabre\Uri\split($principal) \Sabre\Uri\split($principalUri) - \Sabre\Uri\split($member) + \Sabre\Uri\split($principalUri) + \Sabre\Uri\split($principalUri) + \Sabre\Uri\split($principalUri) \Sabre\Uri\split($principalUri) \Sabre\Uri\split($realPrincipalUri) - \Sabre\Uri\split($principalUri) - \Sabre\Uri\split($principalUri) - \Sabre\Uri\split($principalUri) @@ -1028,13 +1053,16 @@ + + $result + $result - $userSession && $userSession->isLoggedIn() + $userSession @@ -1042,17 +1070,16 @@ [$to => $recipientDisplayName] - setSubject setHtmlBody setPlainBody + setSubject $result - - $position + $position $position @@ -1070,18 +1097,18 @@ throw $exception; - $userSession && $userSession->isLoggedIn() - $encryptedFileKey && $shareKey + $encryptedFileKey + $userSession + 0 + 0 1 - 0 - 0 - $userSession && $userSession->isLoggedIn() + $userSession @@ -1091,12 +1118,12 @@ - $userSession && $userSession->isLoggedIn() + $userSession - $userSession && $userSession->isLoggedIn() + $userSession @@ -1107,24 +1134,24 @@ + $id + $id + $id + $id + $id + $id $remoteId - $id - $id - $id - $id - $id - $id - $permission === null $remoteId === null + - $token $remoteId + $token list($token, $remoteId) @@ -1136,11 +1163,11 @@ getSharesInFolder - $shareId - $shareId - $shareId - $shareId $share->getId() + $shareId + $shareId + $shareId + $shareId (int)$data['id'] @@ -1163,13 +1190,13 @@ string + $id + $id + $id + $id + $id $remoteId - $id - $id - $id (int)$share['id'] - $id - $id @@ -1241,9 +1268,9 @@ + $offset + $offset 0 - $offset - $offset @@ -1282,8 +1309,8 @@ $templateId - open getTemplates + open @@ -1388,8 +1415,8 @@ $mountId - $status $e->getCode() + $status @@ -1399,10 +1426,10 @@ - $this->service->getVisibilityType() - $this->service->getVisibilityType() - $status $e->getCode() + $status + $this->service->getVisibilityType() + $this->service->getVisibilityType() @@ -1429,8 +1456,8 @@ - IdentifierTrait $this->deprecateTo + IdentifierTrait @@ -1548,9 +1575,6 @@ filetype fopen - - $content - @@ -1559,10 +1583,10 @@ - setIV + decrypt encrypt setIV - decrypt + setIV string @@ -1635,17 +1659,6 @@ null - - $entry - $entry - $entry - $entry - $entry - $entry - $entry - $entry - $entry - @@ -1665,15 +1678,15 @@ - 'https' 'http' + 'https' + $code + $code Constants::PERMISSION_ALL - $code - $code null @@ -1694,13 +1707,13 @@ - 'Share is read-only' $files_list + 'Share is read-only' - $maxUploadFilesize - $maxUploadFilesize $freeSpace + $maxUploadFilesize + $maxUploadFilesize null @@ -1716,14 +1729,6 @@ null - - - $result - $result - $result - $file - - (int) $remoteShare @@ -1736,8 +1741,8 @@ - scan array + scan $recursive @@ -1745,10 +1750,6 @@ $cacheData - - $existingChild - $existingChild - @@ -1803,28 +1804,27 @@ + $this->nonMaskedStorage->fopen($this->getUnjailedPath($path), $mode) $this->sourceRootInfo false false false - $this->nonMaskedStorage->fopen($this->getUnjailedPath($path), $mode) - false ICacheEntry $this->getPermissions($path) & \OCP\Constants::PERMISSION_CREATE - $this->getPermissions($path) & \OCP\Constants::PERMISSION_UPDATE $this->getPermissions($path) & \OCP\Constants::PERMISSION_DELETE $this->getPermissions($path) & \OCP\Constants::PERMISSION_SHARE + $this->getPermissions($path) & \OCP\Constants::PERMISSION_UPDATE new FailedCache() isCreatable - isUpdatable isDeletable isSharable + isUpdatable $this->sourceRootInfo @@ -1847,9 +1847,6 @@ dispatch - dispatch - dispatch - dispatch @@ -1987,16 +1984,16 @@ + $publicData[IAccountManager::PROPERTY_ADDRESS]['value'] $publicData[IAccountManager::PROPERTY_DISPLAYNAME]['value'] $publicData[IAccountManager::PROPERTY_EMAIL]['value'] - $publicData[IAccountManager::PROPERTY_ADDRESS]['value'] - $publicData[IAccountManager::PROPERTY_WEBSITE]['value'] - $publicData[IAccountManager::PROPERTY_TWITTER]['value'] $publicData[IAccountManager::PROPERTY_PHONE]['value'] $publicData[IAccountManager::PROPERTY_TWITTER]['signature'] - $publicData[IAccountManager::PROPERTY_WEBSITE]['signature'] - $publicData[IAccountManager::PROPERTY_WEBSITE]['verified'] + $publicData[IAccountManager::PROPERTY_TWITTER]['value'] $publicData[IAccountManager::PROPERTY_TWITTER]['verified'] + $publicData[IAccountManager::PROPERTY_WEBSITE]['signature'] + $publicData[IAccountManager::PROPERTY_WEBSITE]['value'] + $publicData[IAccountManager::PROPERTY_WEBSITE]['verified'] $this->retries + 1 @@ -2009,9 +2006,9 @@ + getClientIdentifier getName getRedirectUri - getClientIdentifier getSecret @@ -2025,12 +2022,12 @@ $quota - - $groupid === null || trim($groupid) === '' - $groupid === null + + $groupid === null + getSubAdmin @@ -2055,22 +2052,22 @@ - IDBConnection::CHECK_MISSING_INDEXES_EVENT IDBConnection::CHECK_MISSING_COLUMNS_EVENT + IDBConnection::CHECK_MISSING_INDEXES_EVENT $lastCronRun - new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.') $response + new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.') DataResponse - 0 $lastCronRun + 0 dispatch @@ -2079,8 +2076,8 @@ - $this->l10n->t('Invalid SMTP password.') $this->l10n->t('A problem occurred while sending the email. Please revise your settings. (Error: %s)', [$e->getMessage()]) + $this->l10n->t('Invalid SMTP password.') $this->l10n->t('You need to set your user email before being able to send test emails.') @@ -2147,9 +2144,9 @@ getSharesInFolder - $shareId - $shareId $share->getId() + $shareId + $shareId (int)$data['id'] @@ -2161,11 +2158,11 @@ + $this->config->getAppValue('testing', $lock) + $this->config->getAppValue('testing', $lock) + $this->config->getAppValue('testing', $lock) $type $type - $this->config->getAppValue('testing', $lock) - $this->config->getAppValue('testing', $lock) - $this->config->getAppValue('testing', $lock) @@ -2183,8 +2180,8 @@ - $offset_w $offset_h + $offset_w @@ -2199,7 +2196,9 @@ getSlogan - + + (int)$cacheBusterKey + 1 + null null @@ -2239,8 +2238,8 @@ $newToken - 0 $this->timeFactory->getTime() + 0 @@ -2248,9 +2247,9 @@ $this->users - 0 $errors 0 + 0 @@ -2272,7 +2271,9 @@ - + + $ln + 1 + @@ -2287,43 +2288,43 @@ $record - $values $uuid + $values string[] - [$attr => $result['values']] - $key - $key $e->getCode() + $filter + $filter + $key + $key $nameAttribute - $filter - $this->connection->ldapLoginFilter - $this->connection->ldapLoginFilter - $this->connection->ldapUserDisplayName - $this->connection->ldapUserDisplayName $this->connection->ldapGroupDisplayName - $filter + $this->connection->ldapLoginFilter + $this->connection->ldapLoginFilter + $this->connection->ldapUserDisplayName + $this->connection->ldapUserDisplayName + [$attr => $result['values']] $cookie + !is_null($limit) !isset($ldapName[0]) && empty($ldapName[0]) - is_null($limit) - !is_null($limit) && (int)$this->connection->ldapPagingSize !== 0 + $limit === 0 is_array($result) - $limit === 0 && !empty($this->lastCookie) + is_null($limit) - is_null($findings) !$attribute === null + is_null($findings) - is_array($attr) !is_null($attr) && !is_array($attr) + is_array($attr) isset($ldapRecord[$this->connection->$uuidAttr]) @@ -2359,16 +2360,16 @@ $this->cachedGroupMembers[$gid] - 'dn' $this->cachedGroupsByMember[$uid] + 'dn' - new CappedMemoryCache() - new CappedMemoryCache() - new CappedMemoryCache() $this->cachedGroupMembers - $this->cachedNestedGroups $this->cachedGroupsByMember + $this->cachedNestedGroups + new CappedMemoryCache() + new CappedMemoryCache() + new CappedMemoryCache() $groupName @@ -2378,33 +2379,33 @@ $gAssoc - $this->access->connection->ldapLoginFilter + $groupID + $groupID + $this->access->connection->ldapDynamicGroupMemberURL $this->access->connection->ldapDynamicGroupMemberURL - $this->access->connection->ldapGroupFilter - $this->access->connection->ldapGroupMemberAssocAttr $this->access->connection->ldapGidNumber - $groupID - $groupID - $this->access->connection->ldapDynamicGroupMemberURL + $this->access->connection->ldapGroupDisplayName + $this->access->connection->ldapGroupFilter + $this->access->connection->ldapGroupFilter $this->access->connection->ldapGroupFilter - $this->access->connection->ldapUserDisplayName $this->access->connection->ldapGroupMemberAssocAttr - [strtolower($this->access->connection->ldapGroupMemberAssocAttr), $this->access->connection->ldapGroupDisplayName, 'dn'] + $this->access->connection->ldapGroupMemberAssocAttr + $this->access->connection->ldapLoginFilter + $this->access->connection->ldapLoginFilter $this->access->connection->ldapLoginFilter $this->access->connection->ldapUserDisplayName - $this->access->connection->ldapLoginFilter + $this->access->connection->ldapUserDisplayName $this->access->connection->ldapUserDisplayName [$this->access->connection->ldapGroupDisplayName, 'dn'] - $this->access->connection->ldapGroupFilter - $this->access->connection->ldapGroupDisplayName + [strtolower($this->access->connection->ldapGroupMemberAssocAttr), $this->access->connection->ldapGroupDisplayName, 'dn'] - - !is_array($members) || count($members) === 0 - is_array($members) - is_array($list) + is_array($groupDNs) + is_array($list) + is_array($members) - + + !is_array($members) is_array($members) @@ -2420,21 +2421,21 @@ - 0 $newOffset + 0 50 - $lastChange $i + $lastChange - self::MIN_INTERVAL $interval 0 0 + self::MIN_INTERVAL $argument @@ -2456,46 +2457,46 @@ - $link - $link - $result - $link - $link - $link - $result - $link - $result - $link - $result - $link - $result - $link - $link + $baseDN $baseDN $link - $baseDN + $link + $link + $link + $link + $link + $link + $link + $link + $link + $link $link $link $link $resource + $result + $result + $result + $result + $result $baseDN - bool|mixed - mixed|true - mixed - mixed array|mixed + array|mixed + bool|mixed + bool|mixed + bool|mixed + mixed + mixed + mixed + mixed + mixed mixed|string - array|mixed - mixed - mixed - mixed - bool|mixed mixed|true - bool|mixed + mixed|true Resource @@ -2518,6 +2519,11 @@ bool + + + $result + + protected function handleRequest($id, $method, $parameters, $passOnWhen = false) { @@ -2544,21 +2550,21 @@ null + $emailAttribute + $quotaAttribute + $this->access->connection->homeFolderNamingRule + $this->access->connection->homeFolderNamingRule + $this->connection->homeFolderNamingRule + $this->connection->homeFolderNamingRule + $this->connection->ldapEmailAttribute + $this->connection->ldapExtStorageHomeAttribute + $this->connection->ldapExtStorageHomeAttribute $this->connection->ldapQuotaAttribute $this->connection->ldapUserDisplayName $this->connection->ldapUserDisplayName2 - $this->connection->ldapEmailAttribute - $this->connection->homeFolderNamingRule - $this->connection->homeFolderNamingRule $this->getHomePath($ldapEntry[$attr][0]) - $this->connection->ldapExtStorageHomeAttribute - $this->access->connection->homeFolderNamingRule - $this->access->connection->homeFolderNamingRule - true 1 - $emailAttribute - $quotaAttribute - $this->connection->ldapExtStorageHomeAttribute + true @@ -2566,13 +2572,13 @@ string|false - $this->access->connection->ldapUserFilter - $this->access->connection->ldapUserFilter - $path $additionalAttribute - $this->access->connection->ldapUserDisplayName $limit $offset + $path + $this->access->connection->ldapUserDisplayName + $this->access->connection->ldapUserFilter + $this->access->connection->ldapUserFilter $limit @@ -2593,29 +2599,29 @@ false - $er - $er - $er $attributes + $er + $er + $er - private function detectGroupMemberAssoc() { private function checkAgentRequirements() { + private function detectGroupMemberAssoc() { private function getAttributeValuesFromEntry($result, $attribute, &$known) { $port $port - LDAP_OPT_PROTOCOL_VERSION - LDAP_OPT_REFERRALS + LDAP_OPT_NETWORK_TIMEOUT LDAP_OPT_NETWORK_TIMEOUT LDAP_OPT_PROTOCOL_VERSION + LDAP_OPT_PROTOCOL_VERSION + LDAP_OPT_REFERRALS LDAP_OPT_REFERRALS - LDAP_OPT_NETWORK_TIMEOUT + !isset($item['cn']) && !is_array($item['cn']) is_array($item['cn']) - !isset($item['cn']) && !is_array($item['cn']) && !isset($item['cn'][0]) $total === false @@ -2689,10 +2695,13 @@ + IManager::EVENT_NAME_REG_CHECK IManager::EVENT_NAME_REG_ENTITY IManager::EVENT_NAME_REG_OPERATION - IManager::EVENT_NAME_REG_CHECK + + $result + [] @@ -2721,11 +2730,11 @@ - isUserScopeEnabled - getOperations getAllConfiguredScopesForOperation - getOperations getChecks + getOperations + getOperations + isUserScopeEnabled @@ -2808,8 +2817,8 @@ setFilterSchemaAssetsExpression - $chunkSize $chunk * $chunkSize + $chunkSize 0 @@ -2882,16 +2891,16 @@ 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 1 1 1 - 0 - 1 - 0 - 0 - 0 - 0 - 0 $this->installer @@ -2922,11 +2931,11 @@ - - !is_string($stateToken) || !is_string($currentToken) + is_string($stateToken) - + + !is_string($stateToken) is_string($stateToken) @@ -2956,17 +2965,17 @@ 0 - 1 + 0 + 0 + 0 + 0 + 0 + 0 0 1 - 0 1 - 0 1 - 0 - 0 - 0 - 0 + 1 @@ -2979,7 +2988,7 @@ $this - $this + $this->create('core_ajax_update', '/core/ajax/update.php') @@ -2989,8 +2998,8 @@ - getIncompatibleApps getAppsNeedingUpgrade + getIncompatibleApps $restrictions @@ -3027,9 +3036,9 @@ + ManagerEvent::EVENT_APP_DISABLE ManagerEvent::EVENT_APP_ENABLE ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS - ManagerEvent::EVENT_APP_DISABLE array @@ -3152,17 +3161,17 @@ - $this->server[$name] - $this->method - isset($this->files[$key]) ? $this->files[$key] : null - isset($this->env[$key]) ? $this->env[$key] : null - isset($this->cookies[$key]) ? $this->cookies[$key] : null - $this->server['UNIQUE_ID'] - $remoteAddress - $uri - $name - $this->getOverwriteHost() $host + $name + $remoteAddress + $this->getOverwriteHost() + $this->method + $this->server[$name] + $this->server['UNIQUE_ID'] + $uri + isset($this->cookies[$key]) ? $this->cookies[$key] : null + isset($this->env[$key]) ? $this->env[$key] : null + isset($this->files[$key]) ? $this->files[$key] : null \is_array($params) @@ -3206,12 +3215,12 @@ - $userLimit - $userPeriod $anonLimit $anonPeriod $exception->getCode() $exception->getCode() + $userLimit + $userPeriod @@ -3279,44 +3288,44 @@ - $trySession && $this->session->exists('login_credentials') + $trySession - parent::getLoginName() - parent::getPassword() - parent::getLastCheck() - parent::setLastCheck($time) - parent::getScope() - parent::setScope(json_encode($scope)) - parent::setScope((string)$scope) - parent::getName() - parent::setName($name) - parent::getRemember() - parent::setToken($token) - parent::setPassword($password) - parent::setExpires($expires) parent::getExpires() + parent::getLastCheck() + parent::getLoginName() + parent::getName() + parent::getPassword() + parent::getRemember() + parent::getScope() + parent::setExpires($expires) + parent::setLastCheck($time) + parent::setName($name) + parent::setPassword($password) + parent::setScope((string)$scope) + parent::setScope(json_encode($scope)) + parent::setToken($token) - parent::getLoginName() - parent::getPassword() - parent::getLastCheck() - parent::setLastCheck($time) - parent::getScope() - parent::setScope(json_encode($scope)) - parent::setScope((string)$scope) - parent::getName() - parent::setName($name) - parent::getRemember() - parent::setToken($token) - parent::setPassword($password) - parent::setExpires($expires) parent::getExpires() + parent::getLastCheck() + parent::getLoginName() + parent::getName() + parent::getPassword() + parent::getRemember() + parent::getScope() + parent::setExpires($expires) + parent::setLastCheck($time) + parent::setName($name) + parent::setPassword($password) parent::setPasswordInvalid($invalid) + parent::setScope((string)$scope) + parent::setScope(json_encode($scope)) + parent::setToken($token) parent::setType(IToken::WIPE_TOKEN) @@ -3325,15 +3334,15 @@ $providers - string[] int[] + string[] - IProvider::EVENT_SUCCESS - IProvider::EVENT_FAILED $tokenId + IProvider::EVENT_FAILED + IProvider::EVENT_SUCCESS $providerStates @@ -3342,9 +3351,9 @@ string[] - $tokenId - $token->getId() $this->timeFactory->getTime() + $token->getId() + $tokenId dispatch @@ -3356,8 +3365,8 @@ $this->providers - [] $this->providers + [] $this->providers @@ -3398,9 +3407,9 @@ ISimpleFile + $data + $data (int) $this->config->getUserValue($this->user->getUID(), 'avatar', 'version', 0) + 1 - $data - $data @@ -3442,6 +3451,9 @@ + + $hasMoreResults + search @@ -3459,6 +3471,13 @@ \DateTime|null + + is_array($mentions[0]) + + + !is_array($mentions[0]) + is_array($mentions[0]) + @@ -3470,6 +3489,10 @@ + + $needsUpdate + $needsUpdate + $needsUpdate @@ -3534,9 +3557,9 @@ IAddressBook[] - bool - array IAddressBook + array + bool null @@ -3564,12 +3587,12 @@ string - $this->adapter->lastInsertId($seqName) $insertQb->execute() + $this->adapter->lastInsertId($seqName) - string int + string $e->getCode() @@ -3602,15 +3625,15 @@ $offset - $this->migrationsPath + $this->migrationsNamespace $this->migrationsNamespace $this->migrationsPath - $this->migrationsNamespace + $this->migrationsPath + $this->migrationsNamespace + $this->migrationsNamespace $this->migrationsPath - $this->migrationsNamespace - $this->migrationsNamespace $this->migrationsPath @@ -3621,8 +3644,8 @@ setFilterSchemaAssetsExpression - '\OC\DB\Migrator::executeSql' '\OC\DB\Migrator::checkTable' + '\OC\DB\Migrator::executeSql' dispatch @@ -3786,22 +3809,15 @@ null null - - $sourceData - $sourceData - $parentData - $parentData - $entry - [] - put - insert getIncomplete + insert + put @@ -3811,21 +3827,14 @@ $path - - $entry - $entry - $entry - $filesData - $data - closeCursor - scanFile scan + scanFile null @@ -3863,9 +3872,6 @@ $data ?? $this->getData($file) - - $child - @@ -3880,13 +3886,6 @@ $this->cache instanceof Cache - - - $cachedData - $entry - $entry - - array @@ -3901,20 +3900,6 @@ array array - - $entry - - - - - $entry - - - formatCacheEntry - - - $entry - @@ -3943,30 +3928,22 @@ - removeUserStorageMount remoteStorageMounts + removeUserStorageMount array - $this->mountsForUsers - $this->mountsForUsers - $this->mountsForUsers - $this->mountsForUsers - $this->mountsForUsers - $this->mountsForUsers $this->cacheInfoCache $this->cacheInfoCache $this->cacheInfoCache - - - - - $this->data - $data - $data - $data + $this->mountsForUsers + $this->mountsForUsers + $this->mountsForUsers + $this->mountsForUsers + $this->mountsForUsers + $this->mountsForUsers @@ -4020,8 +3997,8 @@ - new NonExistingFile($this->root, $this->view, $path) $this->view->hash($type, $this->path, $raw) + new NonExistingFile($this->root, $this->view, $path) string @@ -4040,12 +4017,12 @@ string - new NonExistingFolder($this->root, $this->view, $path) $this->root->get($this->getFullPath($path)) + new NonExistingFolder($this->root, $this->view, $path) - string \OC\Files\Node\Node + string $node @@ -4054,8 +4031,8 @@ null - getUnJailedPath getSourceStorage + getUnJailedPath $this->exists @@ -4063,18 +4040,18 @@ - '\OCP\Files::preWrite' - '\OCP\Files::postWrite' - '\OCP\Files::preCreate' - '\OCP\Files::postCreate' - '\OCP\Files::preDelete' - '\OCP\Files::postDelete' - '\OCP\Files::preTouch' - '\OCP\Files::postTouch' - '\OCP\Files::preRename' - '\OCP\Files::postRename' - '\OCP\Files::preCopy' '\OCP\Files::postCopy' + '\OCP\Files::postCreate' + '\OCP\Files::postDelete' + '\OCP\Files::postRename' + '\OCP\Files::postTouch' + '\OCP\Files::postWrite' + '\OCP\Files::preCopy' + '\OCP\Files::preCreate' + '\OCP\Files::preDelete' + '\OCP\Files::preRename' + '\OCP\Files::preTouch' + '\OCP\Files::preWrite' '\OCP\Files::read' @@ -4124,15 +4101,15 @@ int + $targetNode + $targetNode $this->root->get($newPath) - $targetNode - $targetNode Node + \OC\Files\Node\Node + \OC\Files\Node\Node getChecksum - \OC\Files\Node\Node - \OC\Files\Node\Node $this->getFileInfo()->getId() @@ -4146,16 +4123,16 @@ - string Node + string - \OC\User\User \OC\Files\Mount\MountPoint - int + \OC\User\User array int int + int string @@ -4165,8 +4142,8 @@ string - $this->user $this->mountManager->find($mountPoint) + $this->user null null null @@ -4192,12 +4169,6 @@ $source $target - - $child - $child - $child - $file - @@ -4248,11 +4219,14 @@ string|false - getMetaData array + getMetaData - + !$permissions + $result + $result + $result $count @@ -4263,16 +4237,16 @@ $storage->cache $storage->cache - $storage->scanner - $storage->scanner $storage->propagator $storage->propagator + $storage->scanner + $storage->scanner $storage->updater $storage->updater - null $this->getStorageCache()->getAvailability() + null @@ -4300,20 +4274,15 @@ null - - $cachedData - $cachedData - $cachedData - - true new FailedCache() + true - verifyPath getCache + verifyPath $this->e->getCode() @@ -4366,9 +4335,9 @@ $source - $target $source $target + $target @@ -4378,23 +4347,26 @@ getMetaData + + $result + $helper->getFileSize($fullPath) - file_put_contents($this->getSourcePath($path), $data) $space + file_put_contents($this->getSourcePath($path), $data) - filesize file_put_contents + filesize free_space - null $helper->getFileSize($fullPath) + null - is_null($space) $space === false || is_null($space) + is_null($space) $stat === false @@ -4408,40 +4380,40 @@ - mkdir - rmdir - opendir - is_dir - is_file - stat - filesize - isCreatable - isReadable - isUpdatable - isDeletable - isSharable - getPermissions + copy + copyFromStorage file_exists - filemtime file_get_contents file_put_contents - unlink - rename - copy + filemtime + filesize fopen - getMimeType - hash free_space - search - touch - getLocalFile - hasUpdated - getOwner - getETag getDirectDownload - copyFromStorage - moveFromStorage + getETag + getLocalFile getMetaData + getMimeType + getOwner + getPermissions + hasUpdated + hash + isCreatable + isDeletable + isReadable + isSharable + isUpdatable + is_dir + is_file + mkdir + moveFromStorage + opendir + rename + rmdir + search + stat + touch + unlink \Traversable @@ -4449,18 +4421,18 @@ - $this->storage->opendir($this->findPathToUse($path)) - $this->storage->stat($this->findPathToUse($path)) - $this->storage->filesize($this->findPathToUse($path)) - $this->storage->filemtime($this->findPathToUse($path)) - $this->storage->file_get_contents($this->findPathToUse($path)) $result + $this->storage->file_get_contents($this->findPathToUse($path)) + $this->storage->filemtime($this->findPathToUse($path)) + $this->storage->filesize($this->findPathToUse($path)) + $this->storage->free_space($this->findPathToUse($path)) + $this->storage->getETag($this->findPathToUse($path)) + $this->storage->getLocalFile($this->findPathToUse($path)) $this->storage->getMimeType($this->findPathToUse($path)) $this->storage->hash($type, $this->findPathToUse($path), $raw) - $this->storage->free_space($this->findPathToUse($path)) + $this->storage->opendir($this->findPathToUse($path)) $this->storage->search($query) - $this->storage->getLocalFile($this->findPathToUse($path)) - $this->storage->getETag($this->findPathToUse($path)) + $this->storage->stat($this->findPathToUse($path)) bool @@ -4489,11 +4461,11 @@ - $this->storage->filesize($path) - false - $this->storage->file_get_contents($path) - $this->storage->getLocalFile($path) $stat + $this->storage->file_get_contents($path) + $this->storage->filesize($path) + $this->storage->getLocalFile($path) + false resource|bool @@ -4505,9 +4477,14 @@ array + + $result + $result + $result + - $written $newUnencryptedSize + $written bool @@ -4520,30 +4497,21 @@ null - - $info - $info - $info - $entry - $sourceStorage->getCache()->get($sourceInternalPath) - $info - $info - - $this->getWrapperStorage()->opendir($this->getUnjailedPath($path)) - $this->getWrapperStorage()->stat($this->getUnjailedPath($path)) - $this->getWrapperStorage()->filesize($this->getUnjailedPath($path)) - $this->getWrapperStorage()->filemtime($this->getUnjailedPath($path)) $this->getWrapperStorage()->file_get_contents($this->getUnjailedPath($path)) + $this->getWrapperStorage()->filemtime($this->getUnjailedPath($path)) + $this->getWrapperStorage()->filesize($this->getUnjailedPath($path)) $this->getWrapperStorage()->fopen($this->getUnjailedPath($path), $mode) + $this->getWrapperStorage()->free_space($this->getUnjailedPath($path)) + $this->getWrapperStorage()->getETag($this->getUnjailedPath($path)) + $this->getWrapperStorage()->getLocalFile($this->getUnjailedPath($path)) $this->getWrapperStorage()->getMimeType($this->getUnjailedPath($path)) $this->getWrapperStorage()->hash($type, $this->getUnjailedPath($path), $raw) - $this->getWrapperStorage()->free_space($this->getUnjailedPath($path)) + $this->getWrapperStorage()->opendir($this->getUnjailedPath($path)) $this->getWrapperStorage()->search($query) - $this->getWrapperStorage()->getLocalFile($this->getUnjailedPath($path)) - $this->getWrapperStorage()->getETag($this->getUnjailedPath($path)) + $this->getWrapperStorage()->stat($this->getUnjailedPath($path)) bool @@ -4562,8 +4530,8 @@ - $this->storage->free_space($path) $source + $this->storage->free_space($path) $extension === 'part' @@ -4578,25 +4546,22 @@ $source $target - - $data - - $this->getWrapperStorage()->opendir($path) - $this->getWrapperStorage()->stat($path) - $this->getWrapperStorage()->filesize($path) - $this->getWrapperStorage()->filemtime($path) $this->getWrapperStorage()->file_get_contents($path) + $this->getWrapperStorage()->filemtime($path) + $this->getWrapperStorage()->filesize($path) $this->getWrapperStorage()->fopen($path, $mode) + $this->getWrapperStorage()->free_space($path) + $this->getWrapperStorage()->getDirectDownload($path) + $this->getWrapperStorage()->getETag($path) + $this->getWrapperStorage()->getLocalFile($path) $this->getWrapperStorage()->getMimeType($path) $this->getWrapperStorage()->hash($type, $path, $raw) - $this->getWrapperStorage()->free_space($path) + $this->getWrapperStorage()->opendir($path) $this->getWrapperStorage()->search($query) - $this->getWrapperStorage()->getLocalFile($path) - $this->getWrapperStorage()->getETag($path) - $this->getWrapperStorage()->getDirectDownload($path) + $this->getWrapperStorage()->stat($path) bool @@ -4647,8 +4612,8 @@ $mount - string \OCP\Files\Mount\IMountPoint + string $results @@ -4657,48 +4622,27 @@ \OC\Files\Mount\MountPoint + $fileId $mtime $user - $fileId - null + $mount Filesystem::getMountManager()->find($this->getAbsolutePath($path)) null null null - $mount + null + $result && in_array('delete', $hooks) and $result $storage1 is_resource($source) - $result && in_array('delete', $hooks) and $result $storage + [$storage, $internalPath] - - $data - $data - $data - $data - $content - $content - $content - $content - $content - $rootEntry - $rootEntry - $rootEntry - $rootEntry - $rootEntry - $rootEntry - $rootEntry - $rootEntry - $rootEntry - $rootEntry - $rootEntry - @@ -4718,12 +4662,12 @@ - IGroup::class . '::preAddUser' IGroup::class . '::postAddUser' - IGroup::class . '::preRemoveUser' - IGroup::class . '::postRemoveUser' - IGroup::class . '::preDelete' IGroup::class . '::postDelete' + IGroup::class . '::postRemoveUser' + IGroup::class . '::preAddUser' + IGroup::class . '::preDelete' + IGroup::class . '::preRemoveUser' $hide @@ -4741,9 +4685,9 @@ addToGroup - removeFromGroup countUsersInGroup deleteGroup + removeFromGroup @@ -4760,8 +4704,8 @@ \OC\Group\Group[] - getGroupDetails createGroup + getGroupDetails isAdmin @@ -4844,16 +4788,16 @@ - getPermissions getOwner + getPermissions new IteratorDirectory([]) new NullCache() - opendir getCache + opendir null @@ -4873,12 +4817,9 @@ - $request && hash_equals($logCondition['shared_secret'], $logSecretRequest) + $request - - - is_string($request->getMethod()) @@ -4904,25 +4845,25 @@ $failedRecipients + getSubject getSwiftMessage getTo - getSubject - apcu_store($this->getPrefix() . $key, $value, $ttl) - apcu_exists($this->getPrefix() . $key) - apcu_delete($this->getPrefix() . $key) - apcu_delete($iter) apcu_add($this->getPrefix() . $key, $value, $ttl) + apcu_delete($iter) + apcu_delete($this->getPrefix() . $key) + apcu_exists($this->getPrefix() . $key) + apcu_store($this->getPrefix() . $key, $value, $ttl) - set + bool + clear hasKey remove - clear - bool + set @@ -4934,9 +4875,9 @@ - - $lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable() - + + $lockingCacheClass && class_exists($distributedCacheClass) + @@ -4964,10 +4905,10 @@ - - !($notification instanceof INotification) || !$notification->isValidParsed() - !($notification instanceof INotification) || !$notification->isValidParsed() - + + !($notification instanceof INotification) + !($notification instanceof INotification) + @@ -4981,8 +4922,8 @@ - IPreview::EVENT $maxPreviewImage + IPreview::EVENT ISimpleFile @@ -5001,13 +4942,13 @@ dispatch - valid height - width - width height preciseResizeCopy resizeCopy + valid + width + width @@ -5065,8 +5006,8 @@ - new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, false, $config['password']) new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout) + new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, false, $config['password']) \RedisCluster::OPT_SLAVE_FAILOVER @@ -5098,9 +5039,8 @@ + $query->createFunction('(' . $subQuery->getSQL() . ')') $subQuery->createFunction('(' . $subSubQuery->getSQL() . ')') - $query->createFunction('(' . $subQuery->getSQL() . ')') - $query->createFunction('(' . $subQuery->getSQL() . ')') $this->userToNotify @@ -5139,8 +5079,8 @@ $data->getId() - $data->getPermissions() $data->getMtime() + $data->getPermissions() $this->hasPreview($data) @@ -5178,12 +5118,12 @@ - setPassword - setIV - encrypt - setPassword - setIV decrypt + encrypt + setIV + setIV + setPassword + setPassword @@ -5254,9 +5194,9 @@ !self::isResharingAllowed() - \OC_User::getUser() $shareWith \OC_User::getUser() + \OC_User::getUser() getParents @@ -5284,27 +5224,27 @@ - 'OCP\Share::preShare' - 'OCP\Share::postShare' + $data 'OCP\Share::postAcceptShare' - 'OCP\Share::preUnshare' + 'OCP\Share::postShare' 'OCP\Share::postUnshare' 'OCP\Share::postUnshareFromSelf' - $data + 'OCP\Share::preShare' + 'OCP\Share::preUnshare' - $this->shareApiLinkDefaultExpireDays() - $this->shareApiLinkDefaultExpireDays() $id + $this->shareApiLinkDefaultExpireDays() + $this->shareApiLinkDefaultExpireDays() + dispatch + dispatch + dispatch + dispatch dispatch dispatch update - dispatch - dispatch - dispatch - dispatch \OCA\Circles\Api\v1\Circles @@ -5319,16 +5259,16 @@ ShareByMailProvider - $this->shareByCircleProvider - $this->roomShareProvider $provider $provider $shares + $this->roomShareProvider + $this->shareByCircleProvider + getAllProviders getProvider getProviderForType - getAllProviders null @@ -5342,11 +5282,11 @@ \OCA\Circles\ShareByCircleProvider + RoomShareProvider \OCA\Circles\ShareByCircleProvider \OCA\Talk\Share\RoomShareProvider - RoomShareProvider - private $shareByCircleProvider = null; private $roomShareProvider = null; + private $shareByCircleProvider = null; getLazyRootFolder @@ -5382,8 +5322,8 @@ ManagerEvent::EVENT_CREATE - ManagerEvent::EVENT_UPDATE ManagerEvent::EVENT_DELETE + ManagerEvent::EVENT_UPDATE bool @@ -5439,12 +5379,12 @@ - $this->appendIfExist($this->serverroot, 'core/'.$script.'.js') - $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js') $this->appendIfExist($this->serverroot, $script.'.js') $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js') - $this->appendIfExist($this->serverroot, 'apps/'.$script.'.js') $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js') + $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js') + $this->appendIfExist($this->serverroot, 'apps/'.$script.'.js') + $this->appendIfExist($this->serverroot, 'core/'.$script.'.js') $found @@ -5461,10 +5401,10 @@ string - \OC_User::getUser() - \OC_User::getUser() $appName $appName + \OC_User::getUser() + \OC_User::getUser() Util::addScript('dist/unified-search', null, true) @@ -5482,17 +5422,17 @@ 0 0 - 1 + 0 + 0 + 0 + 0 + 0 + 0 0 1 1 - 0 1 - 0 - 0 - 0 - 0 - 0 + 1 \OC_DB::simulateUpdateDbFromStructure(\OC_App::getAppPath($appId) . '/appinfo/database.xml') @@ -5500,8 +5440,8 @@ - time() microtime(true) + time() @@ -5540,8 +5480,8 @@ checkPassword - createUser countUsers + createUser getUsersForUserValueCaseInsensitive @@ -5569,11 +5509,11 @@ - IUser::class . '::preDelete' - IUser::class . '::postDelete' - IUser::class . '::preSetPassword' - IUser::class . '::postSetPassword' IUser::class . '::changeUser' + IUser::class . '::postDelete' + IUser::class . '::postSetPassword' + IUser::class . '::preDelete' + IUser::class . '::preSetPassword' getBackend @@ -5588,8 +5528,8 @@ IImage|null - $this->lastLogin $quota + $this->lastLogin $this->backend @@ -5602,11 +5542,11 @@ dispatch - setDisplayName - deleteUserAvatar - setPassword - getHome canChangeAvatar + deleteUserAvatar + getHome + setDisplayName + setPassword @@ -5638,15 +5578,15 @@ null - - $appId === null || trim($appId) === '' - dispatch $appId === null + + $appId === null + @@ -5673,9 +5613,9 @@ + $fh $fileInfos [$fileInfo] - $fh mt_rand() @@ -5690,6 +5630,9 @@ + + $matches[1][$last_match][0] + (INF > 0)? INF: PHP_INT_MAX INF @@ -5700,13 +5643,13 @@ int - $path $includeExtStorage ? 'ext' : false + $path $quota 'ext' - count($obd_values) > 0 and $obd_values[0] + count($obd_values) > 0 getSourceStorage @@ -5714,9 +5657,9 @@ + $this->resource $this->valid() ? imagesx($this->resource) : -1 $this->valid() ? imagesy($this->resource) : -1 - $this->resource null|string @@ -5729,29 +5672,29 @@ bool + $imagePath + $imagePath + $imagePath + $imagePath + $imagePath + $imagePath + $imagePath + $imagePath + $imagePath + $imagePath + $imagePath + $imagePath + $imagePath $this->bitDepth - 90 - $imagePath - $imagePath - $imagePath - $imagePath - $imagePath - $imagePath - $imagePath - $imagePath - $imagePath - $imagePath - $imagePath - $imagePath - $imagePath $x $y + 90 bool - $isWritable && file_exists($filePath) + $isWritable @@ -5766,15 +5709,12 @@ - \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false) \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($prevLogging) + \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false) - - $version - $version - $version - $version - + + \OCP\Constants::FILENAME_INVALID_CHARS + OC_Helper::computerFileSize($userQuota) @@ -5786,13 +5726,13 @@ OC_User::getUser() - is_string($expected) 'off' + is_string($expected) is_bool($expected) - is_int($expected) is_bool($setting[1]) + is_int($expected) clearCache @@ -5837,9 +5777,9 @@ - $resource['size'] - $resource['resource'] $resource['internalName'] + $resource['resource'] + $resource['size'] $resource['size'] $resource['time'] diff --git a/composer.json b/composer.json index 702b739306..8a2f4e2558 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require-dev": { "nextcloud/coding-standard": "^0.3.0", - "vimeo/psalm": "3.15" + "vimeo/psalm": "^3.17" }, "scripts": { "cs:fix": "php-cs-fixer fix", diff --git a/composer.lock b/composer.lock index 6f6613fd2e..c8b7fb208f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fc98418ae1268281266b19e737c30fc5", + "content-hash": "4526d0f09bab5c2ef66902593cbc4456", "packages": [], "packages-dev": [ { @@ -2765,16 +2765,16 @@ }, { "name": "vimeo/psalm", - "version": "3.15", + "version": "3.17.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "de6e7f324f44dde540ebe7ebd4eb481b97c86f30" + "reference": "8f211792d813e4dc89f04ed372785ce93b902fd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/de6e7f324f44dde540ebe7ebd4eb481b97c86f30", - "reference": "de6e7f324f44dde540ebe7ebd4eb481b97c86f30", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/8f211792d813e4dc89f04ed372785ce93b902fd1", + "reference": "8f211792d813e4dc89f04ed372785ce93b902fd1", "shasum": "" }, "require": { @@ -2787,6 +2787,7 @@ "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", + "ext-mbstring": "*", "ext-simplexml": "*", "ext-tokenizer": "*", "felixfbecker/advanced-json-rpc": "^3.0.3", @@ -2860,7 +2861,7 @@ "inspection", "php" ], - "time": "2020-09-01T22:09:30+00:00" + "time": "2020-10-13T00:25:46+00:00" }, { "name": "webmozart/assert",