mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24234 from nextcloud/dependabot/composer/vimeo/psalm-4.2.0 

Bump vimeo/psalm from 4.1.1 to 4.2.0
This commit is contained in:
Roeland Jago Douma 2020-11-20 10:03:01 +01:00 committed by GitHub
parent e794d1f5d8 774350c610
commit f8a2c08c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
build/psalm-baseline.xml
View File

@ -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-&gt;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-&gt;formatCacheEntry(clone $this-&gt;sourceRootInfo, '')</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="2">
<code>formatCacheEntry</code>
<code>get</code>
</InvalidReturnType>
<NullArgument occurrences="1">
<code>null</code>
</NullArgument>
@ -1829,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>
@ -1858,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>
@ -2251,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]) &amp;&amp; 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) &amp;&amp; !is_array($attr)</code>
<code>is_array($attr)</code>
<code>isset($ldapRecord[$this-&gt;connection-&gt;$uuidAttr])</code>
</TypeDoesNotContainType>
<UndefinedVariable occurrences="1">
@ -2321,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">
@ -2509,9 +2486,8 @@
<code>LDAP_OPT_REFERRALS</code>
<code>LDAP_OPT_REFERRALS</code>
</InvalidScalarArgument>
<RedundantCondition occurrences="2">
<RedundantCondition occurrences="1">
<code>!isset($item['cn']) &amp;&amp; !is_array($item['cn'])</code>
<code>is_array($item['cn'])</code>
</RedundantCondition>
<TypeDoesNotContainType occurrences="1">
<code>$total === false</code>
@ -2817,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">
@ -3044,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-&gt;getOverwriteHost()</code>
<code>$this-&gt;method</code>
<code>$this-&gt;server[$name]</code>
<code>$this-&gt;server['UNIQUE_ID']</code>
<code>$uri</code>
<code>isset($this-&gt;cookies[$key]) ? $this-&gt;cookies[$key] : null</code>
<code>isset($this-&gt;env[$key]) ? $this-&gt;env[$key] : null</code>
@ -3338,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">
@ -3597,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>
@ -4247,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>
@ -4255,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>
@ -4727,19 +4697,11 @@
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/Memcache/APCu.php">
<InvalidReturnStatement occurrences="5">
<InvalidReturnStatement occurrences="1">
<code>apcu_add($this-&gt;getPrefix() . $key, $value, $ttl)</code>
<code>apcu_delete($iter)</code>
<code>apcu_delete($this-&gt;getPrefix() . $key)</code>
<code>apcu_exists($this-&gt;getPrefix() . $key)</code>
<code>apcu_store($this-&gt;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">
@ -4768,12 +4730,6 @@
<code>exec</code>
<code>exec</code>
</InvalidMethodCall>
<InvalidReturnStatement occurrences="1">
<code>self::$cache-&gt;exists($this-&gt;getNameSpace() . $key)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>hasKey</code>
</InvalidReturnType>
</file>
<file src="lib/private/Migration/BackgroundRepair.php">
<MoreSpecificImplementedParamType occurrences="1">
@ -5092,7 +5048,6 @@
<InvalidScalarArgument occurrences="2">
<code>$id</code>
<code>$this-&gt;shareApiLinkDefaultExpireDays()</code>
<code>$this-&gt;shareApiLinkDefaultExpireDays()</code>
</InvalidScalarArgument>
<TooManyArguments occurrences="7">
<code>dispatch</code>
@ -5659,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">

30
composer.lock generated
View File

@ -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",