From bb05f0e4eb50a13de34e776cbed30bc67a766f55 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 30 Oct 2020 10:48:01 +0100
Subject: [PATCH 1/2] Do not commit updated composer dependencies in psalm
 baseline update

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 .github/workflows/update-psalm-baseline.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml
index e1cb2772e2..ac0bc907af 100644
--- a/.github/workflows/update-psalm-baseline.yml
+++ b/.github/workflows/update-psalm-baseline.yml
@@ -26,7 +26,8 @@ jobs:
         run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
       - name: Reset composer.json and composer.lock
         run: |
-          git checkout -- composer.json composer.lock
+          rm -rf lib/composer
+          git checkout -- composer.json composer.lock lib/composer
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:

From 7410489e86d1d00f0d3bcae9f9994da5d9785bb1 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 30 Oct 2020 10:49:57 +0100
Subject: [PATCH 2/2] Update psalm baseline

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 build/psalm-baseline.xml | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 0d07bcf37f..e1e8c29184 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1713,7 +1713,6 @@
   <file src="apps/files_sharing/lib/Controller/ShareController.php">
     <InvalidArgument occurrences="2">
       <code>$files_list</code>
-      <code>'Share is read-only'</code>
     </InvalidArgument>
     <InvalidScalarArgument occurrences="3">
       <code>$freeSpace</code>
@@ -2476,18 +2475,6 @@
       <code>Resource</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="apps/user_ldap/lib/LDAPProviderFactory.php">
-    <ImplementedReturnTypeMismatch occurrences="1">
-      <code>OCP\LDAP\ILDAPProvider</code>
-    </ImplementedReturnTypeMismatch>
-    <InvalidReturnStatement occurrences="1"/>
-    <InvalidReturnType occurrences="1">
-      <code>OCP\LDAP\ILDAPProvider</code>
-    </InvalidReturnType>
-    <UndefinedDocblockClass occurrences="1">
-      <code>OCP\LDAP\ILDAPProvider</code>
-    </UndefinedDocblockClass>
-  </file>
   <file src="apps/user_ldap/lib/LogWrapper.php">
     <InvalidReturnType occurrences="1">
       <code>bool</code>
@@ -3213,11 +3200,6 @@
       <code>$default</code>
     </MoreSpecificImplementedParamType>
   </file>
-  <file src="lib/private/AppFramework/Services/InitialState.php">
-    <ImplementedParamTypeMismatch occurrences="1">
-      <code>$closure</code>
-    </ImplementedParamTypeMismatch>
-  </file>
   <file src="lib/private/Archive/TAR.php">
     <FalsableReturnStatement occurrences="1">
       <code>false</code>
@@ -3342,21 +3324,12 @@
     <ImplementedReturnTypeMismatch occurrences="1">
       <code>Color</code>
     </ImplementedReturnTypeMismatch>
-    <ImplicitToStringCast occurrences="1">
-      <code>$avatar</code>
-    </ImplicitToStringCast>
-    <InvalidNullableReturnType occurrences="1">
-      <code>string|boolean</code>
-    </InvalidNullableReturnType>
     <InvalidReturnStatement occurrences="1">
       <code>$finalPalette[$this-&gt;hashToInt($hash, $steps * 3)]</code>
     </InvalidReturnStatement>
     <InvalidReturnType occurrences="1">
       <code>Color</code>
     </InvalidReturnType>
-    <NullableReturnStatement occurrences="1">
-      <code>$image-&gt;data()</code>
-    </NullableReturnStatement>
   </file>
   <file src="lib/private/Avatar/GuestAvatar.php">
     <ImplementedReturnTypeMismatch occurrences="1">
@@ -5747,14 +5720,6 @@
       <code>$this-&gt;resources</code>
     </InvalidPropertyAssignmentValue>
   </file>
-  <file src="lib/public/AppFramework/Services/IInitialState.php">
-    <MismatchingDocblockParamType occurrences="1">
-      <code>Closure</code>
-    </MismatchingDocblockParamType>
-    <UndefinedDocblockClass occurrences="1">
-      <code>Closure</code>
-    </UndefinedDocblockClass>
-  </file>
   <file src="lib/public/BackgroundJob/TimedJob.php">
     <MoreSpecificImplementedParamType occurrences="1">
       <code>$jobList</code>