Merge pull request #25876 from nextcloud/psalm/stable20/update

[stable20] Update psalm baseline
This commit is contained in:
Morris Jobke 2021-03-17 14:17:20 +01:00 committed by GitHub
commit 3c1402c2d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 37 deletions

View File

@ -459,7 +459,7 @@ class Crypt {
* @param string $passPhrase * @param string $passPhrase
* @param string $cipher * @param string $cipher
* @param int $version * @param int $version
* @param int $position * @param int|string $position
* @return string * @return string
* @throws DecryptionFailedException * @throws DecryptionFailedException
*/ */

View File

@ -360,7 +360,7 @@ class Encryption implements IEncryptionModule {
* decrypt data * decrypt data
* *
* @param string $data you want to decrypt * @param string $data you want to decrypt
* @param int $position * @param int|string $position
* @return string decrypted data * @return string decrypted data
* @throws DecryptionFailedException * @throws DecryptionFailedException
*/ */

View File

@ -761,8 +761,6 @@
<code>string[]</code> <code>string[]</code>
</InvalidReturnType> </InvalidReturnType>
<NullableReturnStatement occurrences="8"> <NullableReturnStatement occurrences="8">
<code>null</code>
<code>$this-&gt;circleToPrincipal($name)</code>
<code>null</code> <code>null</code>
<code>null</code> <code>null</code>
<code>null</code> <code>null</code>
@ -1132,7 +1130,7 @@
<FalsableReturnStatement occurrences="1"> <FalsableReturnStatement occurrences="1">
<code>$result</code> <code>$result</code>
</FalsableReturnStatement> </FalsableReturnStatement>
<ImplementedParamTypeMismatch occurrences="3"> <ImplementedParamTypeMismatch occurrences="2">
<code>$position</code> <code>$position</code>
<code>$position</code> <code>$position</code>
<code>$position</code> <code>$position</code>
@ -1230,7 +1228,6 @@
<code>bool</code> <code>bool</code>
<code>bool</code> <code>bool</code>
<code>bool</code> <code>bool</code>
<code>bool</code>
</InvalidReturnType> </InvalidReturnType>
</file> </file>
<file src="apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php"> <file src="apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php">
@ -2327,10 +2324,6 @@
<InvalidScalarArgument occurrences="1"> <InvalidScalarArgument occurrences="1">
<code>(int)$cacheBusterKey+1</code> <code>(int)$cacheBusterKey+1</code>
</InvalidScalarArgument> </InvalidScalarArgument>
<NullArgument occurrences="2">
<code>null</code>
<code>null</code>
</NullArgument>
</file> </file>
<file src="apps/theming/lib/Util.php"> <file src="apps/theming/lib/Util.php">
<InvalidReturnStatement occurrences="1"> <InvalidReturnStatement occurrences="1">
@ -2426,10 +2419,10 @@
<code>string[]</code> <code>string[]</code>
</InvalidReturnType> </InvalidReturnType>
<InvalidScalarArgument occurrences="4"> <InvalidScalarArgument occurrences="4">
<code>[$attr =&gt; $result['values']]</code>
<code>$key</code>
<code>$key</code>
<code>$e-&gt;getCode()</code> <code>$e-&gt;getCode()</code>
<code>$key</code>
<code>$key</code>
<code>[$attr =&gt; $result['values']]</code>
</InvalidScalarArgument> </InvalidScalarArgument>
<NullArgument occurrences="1"> <NullArgument occurrences="1">
<code>$cookie</code> <code>$cookie</code>
@ -2450,9 +2443,6 @@
<code>!is_null($attr) &amp;&amp; !is_array($attr)</code> <code>!is_null($attr) &amp;&amp; !is_array($attr)</code>
<code>isset($ldapRecord[$this-&gt;connection-&gt;$uuidAttr])</code> <code>isset($ldapRecord[$this-&gt;connection-&gt;$uuidAttr])</code>
</TypeDoesNotContainType> </TypeDoesNotContainType>
<UndefinedVariable occurrences="1">
<code>$uidsByDn</code>
</UndefinedVariable>
</file> </file>
<file src="apps/user_ldap/lib/AppInfo/Application.php"> <file src="apps/user_ldap/lib/AppInfo/Application.php">
<InvalidArgument occurrences="1"> <InvalidArgument occurrences="1">
@ -2481,8 +2471,7 @@
<ParadoxicalCondition occurrences="1"/> <ParadoxicalCondition occurrences="1"/>
</file> </file>
<file src="apps/user_ldap/lib/Group_LDAP.php"> <file src="apps/user_ldap/lib/Group_LDAP.php">
<InvalidArgument occurrences="2"> <InvalidArgument occurrences="1">
<code>'dn'</code>
<code>$this-&gt;cachedGroupsByMember[$uid]</code> <code>$this-&gt;cachedGroupsByMember[$uid]</code>
</InvalidArgument> </InvalidArgument>
<InvalidPropertyAssignmentValue occurrences="5"> <InvalidPropertyAssignmentValue occurrences="5">
@ -3105,7 +3094,6 @@
<file src="core/routes.php"> <file src="core/routes.php">
<InvalidScope occurrences="2"> <InvalidScope occurrences="2">
<code>$this</code> <code>$this</code>
<code>$this</code>
</InvalidScope> </InvalidScope>
</file> </file>
<file src="core/templates/layout.public.php"> <file src="core/templates/layout.public.php">
@ -3660,9 +3648,6 @@
</NullableReturnStatement> </NullableReturnStatement>
</file> </file>
<file src="lib/private/ContactsManager.php"> <file src="lib/private/ContactsManager.php">
<ImplementedReturnTypeMismatch occurrences="1">
<code>IAddressBook[]</code>
</ImplementedReturnTypeMismatch>
<InvalidNullableReturnType occurrences="3"> <InvalidNullableReturnType occurrences="3">
<code>bool</code> <code>bool</code>
<code>array</code> <code>array</code>
@ -4772,14 +4757,6 @@
<code>true</code> <code>true</code>
</InvalidReturnType> </InvalidReturnType>
</file> </file>
<file src="lib/private/Files/Stream/Encryption.php">
<InvalidScalarArgument occurrences="1">
<code>$position</code>
</InvalidScalarArgument>
<UndefinedInterfaceMethod occurrences="1">
<code>offsetGet</code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/Files/Stream/SeekableHttpStream.php"> <file src="lib/private/Files/Stream/SeekableHttpStream.php">
<FalsableReturnStatement occurrences="3"> <FalsableReturnStatement occurrences="3">
<code>false</code> <code>false</code>
@ -5514,7 +5491,6 @@
<code>$data</code> <code>$data</code>
</InvalidArgument> </InvalidArgument>
<InvalidScalarArgument occurrences="2"> <InvalidScalarArgument occurrences="2">
<code>$this-&gt;shareApiLinkDefaultExpireDays()</code>
<code>$this-&gt;shareApiLinkDefaultExpireDays()</code> <code>$this-&gt;shareApiLinkDefaultExpireDays()</code>
<code>$id</code> <code>$id</code>
</InvalidScalarArgument> </InvalidScalarArgument>
@ -6039,6 +6015,11 @@
<code>'DateTimeFormatter'</code> <code>'DateTimeFormatter'</code>
</UndefinedClass> </UndefinedClass>
</file> </file>
<file src="lib/private/Files/Stream/Encryption.php">
<UndefinedInterfaceMethod occurrences="1">
<code>$cacheEntry</code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/public/AppFramework/ApiController.php"> <file src="lib/public/AppFramework/ApiController.php">
<NoInterfaceProperties occurrences="1"> <NoInterfaceProperties occurrences="1">
<code>$this-&gt;request-&gt;server</code> <code>$this-&gt;request-&gt;server</code>
@ -6093,11 +6074,6 @@
<code>$jobList</code> <code>$jobList</code>
</MoreSpecificImplementedParamType> </MoreSpecificImplementedParamType>
</file> </file>
<file src="lib/public/Contacts/IManager.php">
<UndefinedDocblockClass occurrences="1">
<code>IAddressBook[]</code>
</UndefinedDocblockClass>
</file>
<file src="lib/public/Dashboard/Model/WidgetTemplate.php"> <file src="lib/public/Dashboard/Model/WidgetTemplate.php">
<InvalidNullableReturnType occurrences="1"> <InvalidNullableReturnType occurrences="1">
<code>WidgetSetting</code> <code>WidgetSetting</code>

View File

@ -102,7 +102,7 @@ interface IEncryptionModule {
* decrypt data * decrypt data
* *
* @param string $data you want to decrypt * @param string $data you want to decrypt
* @param string $position position of the block we want to decrypt * @param int|string $position position of the block we want to decrypt
* *
* @return mixed decrypted data * @return mixed decrypted data
* *