Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable20] Update psalm baseline #29299

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 75 additions & 48 deletions build/psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -625,11 +625,6 @@
<code>\Sabre\Uri\split($principal)</code>
</UndefinedFunction>
</file>
<file src="apps/dav/lib/Connector/PublicAuth.php">
<InvalidScalarArgument occurrences="1">
<code>'DummyBasic realm="' . $this-&gt;realm . '"'</code>
</InvalidScalarArgument>
</file>
<file src="apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php">
<InvalidNullableReturnType occurrences="1">
<code>bool</code>
Expand Down Expand Up @@ -1133,7 +1128,6 @@
<ImplementedParamTypeMismatch occurrences="2">
<code>$position</code>
<code>$position</code>
<code>$position</code>
</ImplementedParamTypeMismatch>
<InvalidNullableReturnType occurrences="1">
<code>boolean</code>
Expand Down Expand Up @@ -1237,13 +1231,12 @@
<InvalidReturnType occurrences="1">
<code>string</code>
</InvalidReturnType>
<InvalidScalarArgument occurrences="6">
<InvalidScalarArgument occurrences="5">
<code>$id</code>
<code>$id</code>
<code>$id</code>
<code>(int)$share['id']</code>
<code>$id</code>
<code>$id</code>
</InvalidScalarArgument>
</file>
<file src="apps/federatedfilesharing/lib/Settings/Personal.php">
Expand Down Expand Up @@ -1532,24 +1525,41 @@
</UndefinedClass>
</file>
<file src="apps/files_external/lib/Lib/Storage/AmazonS3.php">
<InvalidReturnStatement occurrences="3">
<code>IteratorDirectory::wrap($files)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="2">
<code>opendir</code>
<code>fopen</code>
</InvalidReturnType>
<UndefinedMagicMethod occurrences="1">
<code>clearBucket</code>
</UndefinedMagicMethod>
</file>
<file src="apps/files_external/lib/Lib/Storage/FTP.php">
<InvalidReturnStatement occurrences="2">
<code>IteratorDirectory::wrap($files)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>opendir</code>
</InvalidReturnType>
</file>
<file src="apps/files_external/lib/Lib/Storage/SFTP.php">
<InternalMethod occurrences="1">
<code>put</code>
</InternalMethod>
<InvalidReturnStatement occurrences="1">
<code>IteratorDirectory::wrap($dirStream)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>opendir</code>
</InvalidReturnType>
<ParamNameMismatch occurrences="2">
<code>$source</code>
<code>$target</code>
</ParamNameMismatch>
</file>
<file src="apps/files_external/lib/Lib/Storage/SFTPReadStream.php">
<FalsableReturnStatement occurrences="2">
<code>false</code>
<code>false</code>
</FalsableReturnStatement>
<InvalidArgument occurrences="2">
<code>$this-&gt;handle</code>
<code>$this-&gt;handle</code>
Expand All @@ -1568,11 +1578,6 @@
</InvalidReturnType>
</file>
<file src="apps/files_external/lib/Lib/Storage/SFTPWriteStream.php">
<FalsableReturnStatement occurrences="3">
<code>false</code>
<code>false</code>
<code>false</code>
</FalsableReturnStatement>
<InvalidArgument occurrences="2">
<code>$this-&gt;handle</code>
<code>$this-&gt;handle</code>
Expand All @@ -1591,9 +1596,6 @@
</InvalidReturnType>
</file>
<file src="apps/files_external/lib/Lib/Storage/SMB.php">
<FalsableReturnStatement occurrences="1">
<code>false</code>
</FalsableReturnStatement>
<InvalidArgument occurrences="1">
<code>$files</code>
</InvalidArgument>
Expand All @@ -1603,8 +1605,13 @@
<InvalidPropertyAssignmentValue occurrences="1">
<code>new CappedMemoryCache()</code>
</InvalidPropertyAssignmentValue>
<InvalidReturnType occurrences="1">
<InvalidReturnStatement occurrences="3">
<code>IteratorDirectory::wrap($names)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="3">
<code>\Icewind\SMB\IFileInfo[]</code>
<code>resource|false</code>
<code>opendir</code>
</InvalidReturnType>
<InvalidScalarArgument occurrences="7">
<code>$e-&gt;getCode()</code>
Expand All @@ -1628,10 +1635,16 @@
<InvalidArgument occurrences="1">
<code>$object-&gt;lastModified</code>
</InvalidArgument>
<InvalidNullableReturnType occurrences="2">
<InvalidNullableReturnType occurrences="1">
<code>filetype</code>
<code>fopen</code>
</InvalidNullableReturnType>
<InvalidReturnStatement occurrences="2">
<code>IteratorDirectory::wrap($files)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="2">
<code>opendir</code>
<code>fopen</code>
</InvalidReturnType>
<UndefinedInterfaceMethod occurrences="1">
<code>$content</code>
</UndefinedInterfaceMethod>
Expand Down Expand Up @@ -2398,10 +2411,10 @@
<code>string[]</code>
</InvalidReturnType>
<InvalidScalarArgument occurrences="4">
<code>$e-&gt;getCode()</code>
<code>[$attr =&gt; $result['values']]</code>
<code>$key</code>
<code>$key</code>
<code>[$attr =&gt; $result['values']]</code>
<code>$e-&gt;getCode()</code>
</InvalidScalarArgument>
<NullArgument occurrences="1">
<code>$cookie</code>
Expand Down Expand Up @@ -3078,6 +3091,7 @@
<file src="core/routes.php">
<InvalidScope occurrences="2">
<code>$this</code>
<code>$this</code>
</InvalidScope>
</file>
<file src="core/templates/layout.public.php">
Expand Down Expand Up @@ -3363,11 +3377,12 @@
<FalsableReturnStatement occurrences="1">
<code>false</code>
</FalsableReturnStatement>
<InvalidReturnStatement occurrences="1">
<InvalidReturnStatement occurrences="2">
<code>$this-&gt;tar-&gt;extractInString($path)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<InvalidReturnType occurrences="2">
<code>string</code>
<code>resource</code>
</InvalidReturnType>
<UndefinedDocblockClass occurrences="1">
<code>$this-&gt;tar-&gt;extractInString($path)</code>
Expand All @@ -3378,6 +3393,10 @@
<code>boolean|null</code>
<code>boolean|null</code>
</ImplementedReturnTypeMismatch>
<InvalidReturnStatement occurrences="1"/>
<InvalidReturnType occurrences="1">
<code>resource</code>
</InvalidReturnType>
</file>
<file src="lib/private/Authentication/LoginCredentials/Store.php">
<RedundantCondition occurrences="1">
Expand Down Expand Up @@ -4300,6 +4319,13 @@
</MoreSpecificImplementedParamType>
</file>
<file src="lib/private/Files/ObjectStore/ObjectStoreStorage.php">
<InvalidReturnStatement occurrences="3">
<code>IteratorDirectory::wrap($files)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="2">
<code>opendir</code>
<code>fopen</code>
</InvalidReturnType>
<ParamNameMismatch occurrences="2">
<code>$source</code>
<code>$target</code>
Expand Down Expand Up @@ -4355,6 +4381,12 @@
<code>$this-&gt;params['url']</code>
</InvalidArrayOffset>
</file>
<file src="lib/private/Files/SimpleFS/NewSimpleFile.php">
<InvalidReturnStatement occurrences="1"/>
<InvalidReturnType occurrences="1">
<code>resource</code>
</InvalidReturnType>
</file>
<file src="lib/private/Files/Storage/Common.php">
<ImplementedReturnTypeMismatch occurrences="1">
<code>string|false</code>
Expand Down Expand Up @@ -4384,6 +4416,9 @@
<NullableReturnStatement occurrences="1">
<code>$this-&gt;getStorageCache()-&gt;getAvailability()</code>
</NullableReturnStatement>
<RedundantCondition occurrences="1">
<code>$result and ($file = readdir($dh)) !== false</code>
</RedundantCondition>
</file>
<file src="lib/private/Files/Storage/DAV.php">
<ImplementedReturnTypeMismatch occurrences="1">
Expand All @@ -4396,11 +4431,13 @@
<InvalidNullableReturnType occurrences="1">
<code>getETag</code>
</InvalidNullableReturnType>
<InvalidReturnStatement occurrences="2">
<InvalidReturnStatement occurrences="4">
<code>IteratorDirectory::wrap($content)</code>
<code>$response-&gt;getBody()</code>
<code>$result</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="2">
<InvalidReturnType occurrences="3">
<code>opendir</code>
<code>fopen</code>
<code>int</code>
</InvalidReturnType>
Expand Down Expand Up @@ -4468,11 +4505,14 @@
</InvalidScalarArgument>
</file>
<file src="lib/private/Files/Storage/Flysystem.php">
<InvalidReturnStatement occurrences="1">
<InvalidReturnStatement occurrences="3">
<code>$this-&gt;flysystem-&gt;getTimestamp($this-&gt;buildPath($path))</code>
<code>IteratorDirectory::wrap($names)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<InvalidReturnType occurrences="3">
<code>filemtime</code>
<code>opendir</code>
<code>fopen</code>
</InvalidReturnType>
<ParamNameMismatch occurrences="4">
<code>$source</code>
Expand All @@ -4487,7 +4527,7 @@
</ImplicitToStringCast>
<InvalidReturnStatement occurrences="3">
<code>$helper-&gt;getFileSize($fullPath)</code>
<code>file_put_contents($this-&gt;getSourcePath($path), $data)</code>
<code>$result</code>
<code>$space</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="3">
Expand Down Expand Up @@ -4710,11 +4750,6 @@
</InvalidReturnType>
</file>
<file src="lib/private/Files/Stream/SeekableHttpStream.php">
<FalsableReturnStatement occurrences="3">
<code>false</code>
<code>false</code>
<code>false</code>
</FalsableReturnStatement>
<InvalidPropertyAssignmentValue occurrences="2">
<code>$this-&gt;current</code>
<code>$this-&gt;current</code>
Expand Down Expand Up @@ -5041,11 +5076,6 @@
<code>mixed</code>
</LessSpecificImplementedReturnType>
</file>
<file src="lib/private/Memcache/Factory.php">
<RedundantCondition occurrences="1">
<code>$lockingCacheClass &amp;&amp; class_exists($distributedCacheClass) &amp;&amp; $lockingCacheClass::isAvailable()</code>
</RedundantCondition>
</file>
<file src="lib/private/Memcache/Memcached.php">
<RedundantCondition occurrences="1">
<code>method_exists(self::$cache, 'deleteMulti')</code>
Expand Down Expand Up @@ -5427,7 +5457,6 @@
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/Share20/Manager.php">
<NullArgument occurrences="1"/>
<InvalidArgument occurrences="7">
<code>'OCP\Share::preShare'</code>
<code>'OCP\Share::postShare'</code>
Expand All @@ -5441,6 +5470,9 @@
<code>$this-&gt;shareApiLinkDefaultExpireDays()</code>
<code>$id</code>
</InvalidScalarArgument>
<NullArgument occurrences="1">
<code>null</code>
</NullArgument>
<TooManyArguments occurrences="7">
<code>dispatch</code>
<code>dispatch</code>
Expand Down Expand Up @@ -5962,11 +5994,6 @@
<code>'DateTimeFormatter'</code>
</UndefinedClass>
</file>
<file src="lib/private/Files/Stream/Encryption.php">
<UndefinedInterfaceMethod occurrences="1">
<code>$cacheEntry</code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/public/AppFramework/ApiController.php">
<NoInterfaceProperties occurrences="1">
<code>$this-&gt;request-&gt;server</code>
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"cs:fix": "php-cs-fixer fix",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/stubs/*' -print0 | xargs -0 -n1 php -l",
"psalm": "psalm"
"psalm": "psalm",
"psalm:update-baseline": "psalm --update-baseline --set-baseline=build/psalm-baseline.xml"
}
}