From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 20 Aug 2020 12:20:54 +0000 (+0200)
Subject: Extend psalm baseline to ignore errors for now
X-Git-Tag: v20.0.0beta1~18^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=69bbbc32a104f6a034b72509e1d51469da39ead2;p=nextcloud-server.git

Extend psalm baseline to ignore errors for now

One is a false positive - see https://github.com/vimeo/psalm/pull/4032

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---

diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 3ee7c97930b..cf04860f44d 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1080,6 +1080,11 @@
       <code>\Sabre\Uri\split($this-&gt;principalInfo['uri'])</code>
     </UndefinedFunction>
   </file>
+  <file src="apps/encryption/lib/Command/ScanLegacyFormat.php">
+    <RedundantCondition occurrences="1">
+      <code>$result</code>
+    </RedundantCondition>
+  </file>
   <file src="apps/encryption/lib/Crypto/Crypt.php">
     <RedundantCondition occurrences="1">
       <code>$userSession &amp;&amp; $userSession-&gt;isLoggedIn()</code>
@@ -4849,6 +4854,9 @@
     </InvalidReturnType>
   </file>
   <file src="lib/private/Files/Stream/Encryption.php">
+    <InvalidScalarArgument occurrences="1">
+      <code>$position</code>
+    </InvalidScalarArgument>
     <UndefinedInterfaceMethod occurrences="1">
       <code>$cacheEntry</code>
     </UndefinedInterfaceMethod>