diff options
| -rw-r--r-- | build/psalm-baseline.xml | 145 | ||||
| -rw-r--r-- | composer.lock | 30 |
2 files changed, 43 insertions, 132 deletions
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index eb5a496e183..cb979928fa7 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<files psalm-version="4.1.1@16bfbd9224698bd738c665f33039fade2a1a3977"> +<files psalm-version="4.2.0@ccf6e2805f4c38655110f425c10ca79511f0bb0e"> <file src="3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php"> <ImplementedReturnTypeMismatch occurrences="1"> <code>string|null</code> @@ -45,12 +45,8 @@ <InvalidScalarArgument occurrences="1"> <code>$e->getCode()</code> </InvalidScalarArgument> - <RedundantCondition occurrences="1"> - <code>is_array($notification)</code> - </RedundantCondition> - <TypeDoesNotContainType occurrences="2"> + <TypeDoesNotContainType occurrences="1"> <code>!is_array($notification)</code> - <code>is_array($notification)</code> </TypeDoesNotContainType> </file> <file src="apps/comments/lib/JSSettingsHelper.php"> @@ -235,11 +231,6 @@ <code>Uri\split($row['principaluri'])</code> </UndefinedFunction> </file> - <file src="apps/dav/lib/CalDAV/Calendar.php"> - <NullableReturnStatement occurrences="1"> - <code>parent::getOwner()</code> - </NullableReturnStatement> - </file> <file src="apps/dav/lib/CalDAV/CalendarHome.php"> <InvalidClass occurrences="1"> <code>\Sabre\CalDAv\Notifications\Collection</code> @@ -441,13 +432,10 @@ </InvalidReturnType> </file> <file src="apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php"> - <TypeDoesNotContainType occurrences="6"> + <TypeDoesNotContainType occurrences="3"> <code>!is_array($newProps['filters']['comps'])</code> <code>!is_array($newProps['filters']['params'])</code> <code>!is_array($newProps['filters']['props'])</code> - <code>is_array($newProps['filters']['comps'])</code> - <code>is_array($newProps['filters']['params'])</code> - <code>is_array($newProps['filters']['props'])</code> </TypeDoesNotContainType> </file> <file src="apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php"> @@ -455,11 +443,6 @@ <code>$webcalData</code> </InvalidArgument> </file> - <file src="apps/dav/lib/CardDAV/AddressBook.php"> - <NullableReturnStatement occurrences="1"> - <code>parent::getOwner()</code> - </NullableReturnStatement> - </file> <file src="apps/dav/lib/CardDAV/AddressBookImpl.php"> <InvalidArgument occurrences="1"> <code>$id</code> @@ -573,12 +556,8 @@ </InvalidArgument> </file> <file src="apps/dav/lib/Comments/EntityTypeCollection.php"> - <RedundantCondition occurrences="1"> - <code>is_string($name)</code> - </RedundantCondition> - <TypeDoesNotContainType occurrences="2"> + <TypeDoesNotContainType occurrences="1"> <code>!is_string($name)</code> - <code>is_string($name)</code> </TypeDoesNotContainType> </file> <file src="apps/dav/lib/Comments/RootCollection.php"> @@ -1639,6 +1618,14 @@ <FalsableReturnStatement occurrences="1"> <code>false</code> </FalsableReturnStatement> + <InvalidReturnStatement occurrences="2"> + <code>$entry</code> + <code>$this->formatCacheEntry(clone $this->sourceRootInfo, '')</code> + </InvalidReturnStatement> + <InvalidReturnType occurrences="2"> + <code>formatCacheEntry</code> + <code>get</code> + </InvalidReturnType> <NullArgument occurrences="1"> <code>null</code> </NullArgument> @@ -1659,12 +1646,6 @@ <code>\OCA\Talk\Share\Helper\DeletedShareAPIController</code> </UndefinedDocblockClass> </file> - <file src="apps/files_sharing/lib/Controller/ExternalSharesController.php"> - <InvalidArgument occurrences="2"> - <code>'http'</code> - <code>'https'</code> - </InvalidArgument> - </file> <file src="apps/files_sharing/lib/Controller/ShareAPIController.php"> <InvalidScalarArgument occurrences="3"> <code>$code</code> @@ -1689,9 +1670,8 @@ </UndefinedDocblockClass> </file> <file src="apps/files_sharing/lib/Controller/ShareController.php"> - <InvalidArgument occurrences="2"> + <InvalidArgument occurrences="1"> <code>$files_list</code> - <code>'Share has no read permission'</code> </InvalidArgument> <InvalidScalarArgument occurrences="3"> <code>$freeSpace</code> @@ -1707,11 +1687,6 @@ <code>$password</code> </NullArgument> </file> - <file src="apps/files_sharing/lib/ExpireSharesJob.php"> - <NullArgument occurrences="1"> - <code>null</code> - </NullArgument> - </file> <file src="apps/files_sharing/lib/External/Manager.php"> <InvalidScalarArgument occurrences="1"> <code>(int) $remoteShare</code> @@ -1841,9 +1816,6 @@ </NullableReturnStatement> </file> <file src="apps/files_trashbin/lib/Sabre/AbstractTrashFolder.php"> - <ImplementedReturnTypeMismatch occurrences="1"> - <code>ITrash</code> - </ImplementedReturnTypeMismatch> <InvalidReturnStatement occurrences="1"> <code>$entry</code> </InvalidReturnStatement> @@ -1870,9 +1842,6 @@ </UndefinedFunction> </file> <file src="apps/files_trashbin/lib/Sabre/TrashRoot.php"> - <ImplementedReturnTypeMismatch occurrences="1"> - <code>ITrash</code> - </ImplementedReturnTypeMismatch> <InvalidReturnStatement occurrences="1"> <code>$entry</code> </InvalidReturnStatement> @@ -2048,13 +2017,6 @@ <code>dispatch</code> </TooManyArguments> </file> - <file src="apps/settings/lib/Controller/MailSettingsController.php"> - <InvalidArgument occurrences="3"> - <code>$this->l10n->t('A problem occurred while sending the email. Please revise your settings. (Error: %s)', [$e->getMessage()])</code> - <code>$this->l10n->t('Invalid SMTP password.')</code> - <code>$this->l10n->t('You need to set your user email before being able to send test emails.')</code> - </InvalidArgument> - </file> <file src="apps/settings/lib/Hooks.php"> <InvalidArgument occurrences="1"> <code>[$user->getEMailAddress() => $user->getDisplayName()]</code> @@ -2204,9 +2166,6 @@ </InvalidArgument> </file> <file src="apps/updatenotification/lib/Controller/AdminController.php"> - <InvalidArgument occurrences="1"> - <code>$newToken</code> - </InvalidArgument> <InvalidScalarArgument occurrences="2"> <code>$this->timeFactory->getTime()</code> <code>0</code> @@ -2273,20 +2232,18 @@ <NullArgument occurrences="1"> <code>$cookie</code> </NullArgument> - <RedundantCondition occurrences="5"> + <RedundantCondition occurrences="4"> <code>!is_null($limit)</code> <code>!isset($ldapName[0]) && empty($ldapName[0])</code> <code>$limit === 0</code> <code>is_array($result)</code> - <code>is_null($limit)</code> </RedundantCondition> <TypeDoesNotContainNull occurrences="2"> <code>!$attribute === null</code> <code>is_null($findings)</code> </TypeDoesNotContainNull> - <TypeDoesNotContainType occurrences="3"> + <TypeDoesNotContainType occurrences="2"> <code>!is_null($attr) && !is_array($attr)</code> - <code>is_array($attr)</code> <code>isset($ldapRecord[$this->connection->$uuidAttr])</code> </TypeDoesNotContainType> <UndefinedVariable occurrences="1"> @@ -2343,14 +2300,12 @@ <code>$groupID</code> <code>$groupID</code> </InvalidScalarArgument> - <RedundantCondition occurrences="3"> + <RedundantCondition occurrences="2"> <code>is_array($groupDNs)</code> <code>is_array($list)</code> - <code>is_array($members)</code> </RedundantCondition> - <TypeDoesNotContainType occurrences="2"> + <TypeDoesNotContainType occurrences="1"> <code>!is_array($members)</code> - <code>is_array($members)</code> </TypeDoesNotContainType> </file> <file src="apps/user_ldap/lib/Helper.php"> @@ -2531,9 +2486,8 @@ <code>LDAP_OPT_REFERRALS</code> <code>LDAP_OPT_REFERRALS</code> </InvalidScalarArgument> - <RedundantCondition occurrences="2"> + <RedundantCondition occurrences="1"> <code>!isset($item['cn']) && !is_array($item['cn'])</code> - <code>is_array($item['cn'])</code> </RedundantCondition> <TypeDoesNotContainType occurrences="1"> <code>$total === false</code> @@ -2591,9 +2545,6 @@ </InvalidArgument> </file> <file src="apps/workflowengine/lib/Controller/AWorkflowController.php"> - <InvalidArgument occurrences="1"> - <code>$deleted</code> - </InvalidArgument> <InvalidScalarArgument occurrences="3"> <code>$e->getCode()</code> <code>$e->getCode()</code> @@ -2842,12 +2793,8 @@ </TooManyArguments> </file> <file src="core/Controller/ClientFlowLoginV2Controller.php"> - <RedundantCondition occurrences="1"> - <code>is_string($stateToken)</code> - </RedundantCondition> - <TypeDoesNotContainType occurrences="2"> + <TypeDoesNotContainType occurrences="1"> <code>!is_string($stateToken)</code> - <code>is_string($stateToken)</code> </TypeDoesNotContainType> </file> <file src="core/Controller/CollaborationResourcesController.php"> @@ -3069,14 +3016,12 @@ </InvalidReturnType> </file> <file src="lib/private/AppFramework/Http/Request.php"> - <NullableReturnStatement occurrences="11"> + <NullableReturnStatement occurrences="9"> <code>$host</code> <code>$name</code> <code>$remoteAddress</code> <code>$this->getOverwriteHost()</code> <code>$this->method</code> - <code>$this->server[$name]</code> - <code>$this->server['UNIQUE_ID']</code> <code>$uri</code> <code>isset($this->cookies[$key]) ? $this->cookies[$key] : null</code> <code>isset($this->env[$key]) ? $this->env[$key] : null</code> @@ -3161,9 +3106,6 @@ <code>strtolower</code> </RedundantCondition> </file> - <file src="lib/private/AppFramework/ScopedPsrLogger.php"> - <InvalidArgument occurrences="1"/> - </file> <file src="lib/private/AppFramework/Services/AppConfig.php"> <MoreSpecificImplementedParamType occurrences="1"> <code>$default</code> @@ -3366,12 +3308,8 @@ <ImplementedReturnTypeMismatch occurrences="1"> <code>\DateTime|null</code> </ImplementedReturnTypeMismatch> - <RedundantCondition occurrences="1"> - <code>is_array($mentions[0])</code> - </RedundantCondition> - <TypeDoesNotContainType occurrences="2"> + <TypeDoesNotContainType occurrences="1"> <code>!is_array($mentions[0])</code> - <code>is_array($mentions[0])</code> </TypeDoesNotContainType> </file> <file src="lib/private/Comments/Manager.php"> @@ -3625,6 +3563,9 @@ </ImplementedReturnTypeMismatch> </file> <file src="lib/private/Diagnostics/QueryLogger.php"> + <InvalidReturnType occurrences="1"> + <code>stopQuery</code> + </InvalidReturnType> <InvalidScalarArgument occurrences="1"> <code>microtime(true)</code> </InvalidScalarArgument> @@ -4275,7 +4216,7 @@ </NoInterfaceProperties> </file> <file src="lib/private/Files/Storage/Wrapper/Availability.php"> - <InvalidNullableReturnType occurrences="34"> + <InvalidNullableReturnType occurrences="35"> <code>copy</code> <code>copyFromStorage</code> <code>file_exists</code> @@ -4283,6 +4224,7 @@ <code>file_put_contents</code> <code>filemtime</code> <code>filesize</code> + <code>filetype</code> <code>fopen</code> <code>free_space</code> <code>getDirectDownload</code> @@ -4755,19 +4697,11 @@ </UndefinedInterfaceMethod> </file> <file src="lib/private/Memcache/APCu.php"> - <InvalidReturnStatement occurrences="5"> + <InvalidReturnStatement occurrences="1"> <code>apcu_add($this->getPrefix() . $key, $value, $ttl)</code> - <code>apcu_delete($iter)</code> - <code>apcu_delete($this->getPrefix() . $key)</code> - <code>apcu_exists($this->getPrefix() . $key)</code> - <code>apcu_store($this->getPrefix() . $key, $value, $ttl)</code> </InvalidReturnStatement> - <InvalidReturnType occurrences="5"> + <InvalidReturnType occurrences="1"> <code>bool</code> - <code>clear</code> - <code>hasKey</code> - <code>remove</code> - <code>set</code> </InvalidReturnType> </file> <file src="lib/private/Memcache/Cache.php"> @@ -4796,12 +4730,6 @@ <code>exec</code> <code>exec</code> </InvalidMethodCall> - <InvalidReturnStatement occurrences="1"> - <code>self::$cache->exists($this->getNameSpace() . $key)</code> - </InvalidReturnStatement> - <InvalidReturnType occurrences="1"> - <code>hasKey</code> - </InvalidReturnType> </file> <file src="lib/private/Migration/BackgroundRepair.php"> <MoreSpecificImplementedParamType occurrences="1"> @@ -5120,7 +5048,6 @@ <InvalidScalarArgument occurrences="2"> <code>$id</code> <code>$this->shareApiLinkDefaultExpireDays()</code> - <code>$this->shareApiLinkDefaultExpireDays()</code> </InvalidScalarArgument> <TooManyArguments occurrences="7"> <code>dispatch</code> @@ -5635,14 +5562,6 @@ <code>$column</code> </NullableReturnStatement> </file> - <file src="lib/public/AppFramework/Http/DataResponse.php"> - <InvalidReturnStatement occurrences="1"> - <code>$this->data</code> - </InvalidReturnStatement> - <InvalidReturnType occurrences="1"> - <code>array</code> - </InvalidReturnType> - </file> <file src="lib/public/AppFramework/Http/JSONResponse.php"> <InvalidReturnStatement occurrences="1"> <code>$this->data</code> @@ -5695,17 +5614,9 @@ </FalsableReturnStatement> </file> <file src="lib/public/Files/Storage.php"> - <InvalidReturnType occurrences="1"> - <code>string|false</code> - </InvalidReturnType> - </file> - <file src="lib/public/Files/Storage/IStorage.php"> <InvalidParamDefault occurrences="1"> <code>array</code> </InvalidParamDefault> - <InvalidReturnType occurrences="1"> - <code>string|false</code> - </InvalidReturnType> </file> <file src="lib/public/FullTextSearch/Model/ISearchRequest.php"> <InvalidClass occurrences="1"> diff --git a/composer.lock b/composer.lock index 2e247023f63..f131d7972f8 100644 --- a/composer.lock +++ b/composer.lock @@ -159,16 +159,16 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.11.99", + "version": "1.11.99.1", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "c8c9aa8a14cc3d3bec86d0a8c3fa52ea79936855" + "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c8c9aa8a14cc3d3bec86d0a8c3fa52ea79936855", - "reference": "c8c9aa8a14cc3d3bec86d0a8c3fa52ea79936855", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/7413f0b55a051e89485c5cb9f765fe24bb02a7b6", + "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6", "shasum": "" }, "require": { @@ -224,7 +224,7 @@ "type": "tidelift" } ], - "time": "2020-08-25T05:50:16+00:00" + "time": "2020-11-11T10:22:58+00:00" }, { "name": "composer/semver", @@ -303,16 +303,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.4.4", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "6e076a124f7ee146f2487554a94b6a19a74887ba" + "reference": "f28d44c286812c714741478d968104c5e604a1d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6e076a124f7ee146f2487554a94b6a19a74887ba", - "reference": "6e076a124f7ee146f2487554a94b6a19a74887ba", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f28d44c286812c714741478d968104c5e604a1d4", + "reference": "f28d44c286812c714741478d968104c5e604a1d4", "shasum": "" }, "require": { @@ -357,7 +357,7 @@ "type": "tidelift" } ], - "time": "2020-10-24T12:39:10+00:00" + "time": "2020-11-13T08:04:11+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -2760,16 +2760,16 @@ }, { "name": "vimeo/psalm", - "version": "4.1.1", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "16bfbd9224698bd738c665f33039fade2a1a3977" + "reference": "ccf6e2805f4c38655110f425c10ca79511f0bb0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/16bfbd9224698bd738c665f33039fade2a1a3977", - "reference": "16bfbd9224698bd738c665f33039fade2a1a3977", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/ccf6e2805f4c38655110f425c10ca79511f0bb0e", + "reference": "ccf6e2805f4c38655110f425c10ca79511f0bb0e", "shasum": "" }, "require": { @@ -2857,7 +2857,7 @@ "inspection", "php" ], - "time": "2020-11-02T05:54:12+00:00" + "time": "2020-11-20T00:40:40+00:00" }, { "name": "webmozart/assert", |