Merge pull request #2065 from nextcloud/backport/2063/stable31

Author: provokateurin

composer.json

@@ -38,7 +38,7 @@
   "require-dev": {
     "phpunit/phpunit": "^10.5",
     "psalm/phar": "^5.22",
-    "nextcloud/ocp": "dev-master",
+    "nextcloud/ocp": "dev-stable31",
     "nextcloud/coding-standard": "^1.2"
   }
 }

composer.lock

@@ -23,6 +23,8 @@
     </UndefinedDocblockClass>
     <UndefinedInterfaceMethod>
       <code><![CDATA[getLazyRootFolder]]></code>
+      <code><![CDATA[getLogger]]></code>
+      <code><![CDATA[getLogger]]></code>
     </UndefinedInterfaceMethod>
   </file>
   <file src="lib/Command/CirclesRemote.php">
@@ -63,6 +65,11 @@
       <code><![CDATA[hasInvitedBy]]></code>
     </UndefinedInterfaceMethod>
   </file>
+  <file src="lib/Db/CoreQueryBuilder.php">
+    <InaccessibleMethod>
+      <code><![CDATA[CoreQueryBuilder]]></code>
+    </InaccessibleMethod>
+  </file>
   <file src="lib/Db/CoreRequestBuilder.php">
     <UndefinedClass>
       <code><![CDATA[Connection]]></code>
@@ -112,15 +119,6 @@
       <code><![CDATA[CircleEventService]]></code>
     </UndefinedDocblockClass>
   </file>
-  <file src="lib/Migration/ImportOwncloudCustomGroups.php">
-    <MissingDependency>
-      <code><![CDATA[Share]]></code>
-      <code><![CDATA[Share]]></code>
-    </MissingDependency>
-    <UndefinedConstant>
-      <code><![CDATA[Share::SHARE_TYPE_CIRCLE]]></code>
-    </UndefinedConstant>
-  </file>
   <file src="lib/Migration/Version0022Date20220526111723.php">
     <UndefinedClass>
       <code><![CDATA[Connection]]></code>
@@ -223,7 +221,7 @@
   </file>
   <file src="lib/Model/Mount.php">
     <MissingDependency>
-      <code><![CDATA[OCA\Files_Sharing\External\Manager]]></code>
+      <code><![CDATA[CircleMountManager]]></code>
       <code><![CDATA[CircleMountManager]]></code>
       <code><![CDATA[CircleMountManager]]></code>
     </MissingDependency>
@@ -235,8 +233,8 @@
   </file>
   <file src="lib/Model/ShareWrapper.php">
     <InvalidArgument>
+      <code><![CDATA[$attributes]]></code>
       <code><![CDATA[Cache::cacheEntryFromData($this->getFileCache()->toCache(), OC::$server->getMimeTypeLoader())]]></code>
-      <code><![CDATA[$this->setAttributes($attributes)]]></code>
     </InvalidArgument>
     <InvalidNullableReturnType>
       <code><![CDATA[Circle]]></code>
@@ -272,15 +270,10 @@
       <code><![CDATA[MoveableMount]]></code>
     </UndefinedClass>
   </file>
-  <file src="lib/MountManager/CircleMountManager.php">
-    <MissingDependency>
-      <code><![CDATA[OCA\Files_Sharing\External\Manager]]></code>
-    </MissingDependency>
-  </file>
   <file src="lib/MountManager/CircleMountProvider.php">
     <MissingDependency>
       <code><![CDATA[CircleMount]]></code>
-      <code><![CDATA[CircleMountManager]]></code>
+      <code><![CDATA[private]]></code>
     </MissingDependency>
     <UndefinedClass>
       <code><![CDATA[ExternalStorage]]></code>
@@ -296,11 +289,6 @@
       <code><![CDATA[gObj]]></code>
     </InvalidMethodCall>
   </file>
-  <file src="lib/Service/FederatedUserService.php">
-    <InvalidReturnType occurrences="1">
-      <code>FederatedUser</code>
-    </InvalidReturnType>
-  </file>
   <file src="lib/Service/GlobalScaleService.php">
     <UndefinedClass>
       <code><![CDATA[Signer]]></code>
@@ -381,6 +369,11 @@
       <code><![CDATA[$varr[0] !== null]]></code>
     </RedundantCondition>
   </file>
+  <file src="lib/Tools/Db/ExtendedQueryBuilder.php">
+    <InaccessibleMethod>
+      <code><![CDATA[ExtendedQueryBuilder]]></code>
+    </InaccessibleMethod>
+  </file>
   <file src="lib/Tools/Model/NCRequestResult.php">
     <UndefinedClass>
       <code><![CDATA[BadResponseException]]></code>
@@ -403,15 +396,15 @@
     </TooManyArguments>
   </file>
   <file src="lib/Tools/Traits/TNCLogger.php">
-    <UndefinedClass>
-      <code><![CDATA[HintException]]></code>
-    </UndefinedClass>
     <RedundantCondition>
-      <code><![CDATA[$this->logger]]></code>
+      <code><![CDATA[isset($this->logger)]]></code>
     </RedundantCondition>
     <RedundantPropertyInitializationCheck>
       <code><![CDATA[isset($this->logger)]]></code>
     </RedundantPropertyInitializationCheck>
+    <UndefinedClass>
+      <code><![CDATA[HintException]]></code>
+    </UndefinedClass>
   </file>
   <file src="lib/Tools/Traits/TNCRequest.php">
     <InvalidArgument>