Update and fix baseline

Backported some bits of stable21 to make Psalm happy.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

apps/encryption/lib/Crypto/Crypt.php

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

apps/encryption/lib/Crypto/Encryption.php

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

build/psalm-baseline.xml

@@ -1130,7 +1130,7 @@
     <FalsableReturnStatement occurrences="1">
       <code>$result</code>
     </FalsableReturnStatement>
-    <ImplementedParamTypeMismatch occurrences="3">
+    <ImplementedParamTypeMismatch occurrences="2">
       <code>$position</code>
       <code>$position</code>
       <code>$position</code>
@@ -2418,10 +2418,11 @@
     <InvalidReturnType occurrences="1">
       <code>string[]</code>
     </InvalidReturnType>
-    <InvalidScalarArgument occurrences="3">
+    <InvalidScalarArgument occurrences="4">
-      <code>$key</code>
-      <code>$key</code>
       <code>$e-&gt;getCode()</code>
+      <code>$key</code>
+      <code>$key</code>
+      <code>[$attr =&gt; $result['values']]</code>
     </InvalidScalarArgument>
     <NullArgument occurrences="1">
       <code>$cookie</code>
@@ -6014,6 +6015,11 @@
       <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>

lib/public/Encryption/IEncryptionModule.php

@@ -102,7 +102,7 @@ interface IEncryptionModule {
 	 * decrypt data
 	 *
 	 * @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
 	 *