diff --git a/composer.json b/composer.json
index cbb1c747d..11f1b8377 100644
--- a/composer.json
+++ b/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"
   }
 }
diff --git a/composer.lock b/composer.lock
index 8000d9f2f..0258818b2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b42a6fd7d0d9fd93ba90bd6f0cb4dc0e",
+    "content-hash": "3d1906e51799b062f09252d25450248d",
     "packages": [],
     "packages-dev": [
         {
@@ -157,30 +157,29 @@
         },
         {
             "name": "nextcloud/ocp",
-            "version": "dev-master",
+            "version": "dev-stable31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "b0127d6fd2932bf1fdffe334ae59fdd6c8272029"
+                "reference": "77679c75abf21dfc48a75fd282dea09b09ac096c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/b0127d6fd2932bf1fdffe334ae59fdd6c8272029",
-                "reference": "b0127d6fd2932bf1fdffe334ae59fdd6c8272029",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/77679c75abf21dfc48a75fd282dea09b09ac096c",
+                "reference": "77679c75abf21dfc48a75fd282dea09b09ac096c",
                 "shasum": ""
             },
             "require": {
-                "php": "~8.0 || ~8.1 || ~8.2 || ~8.3",
+                "php": "~8.1 || ~8.2 || ~8.3 || ~8.4",
                 "psr/clock": "^1.0",
                 "psr/container": "^2.0.2",
                 "psr/event-dispatcher": "^1.0",
-                "psr/log": "^1.1.4"
+                "psr/log": "^3.0.2"
             },
-            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "31.0.0-dev"
+                    "dev-stable31": "31.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -191,14 +190,18 @@
                 {
                     "name": "Christoph Wurst",
                     "email": "christoph@winzerhof-wurst.at"
+                },
+                {
+                    "name": "Joas Schilling",
+                    "email": "coding@schilljs.com"
                 }
             ],
-            "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
+            "description": "Composer package containing Nextcloud's public OCP API and the unstable NCU API",
             "support": {
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
-                "source": "https://github.com/nextcloud-deps/ocp/tree/master"
+                "source": "https://github.com/nextcloud-deps/ocp/tree/stable31"
             },
-            "time": "2024-08-14T08:51:54+00:00"
+            "time": "2025-07-04T00:53:40+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -1038,30 +1041,30 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.4",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
+                    "Psr\\Log\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1082,9 +1085,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.4"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2021-05-03T11:20:27+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2060,8 +2063,8 @@
     },
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
+    "platform": {},
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.1"
     },
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 0fdeef138..512155848 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -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>