diff --git a/composer.lock b/composer.lock
index 99bf5ce50..396bcf179 100644
--- a/composer.lock
+++ b/composer.lock
@@ -114,12 +114,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "2a005250064759f206aa1b5a1ee000dcd808ef5b"
+                "reference": "10759bbd889e38ef5d6785737db9fb119880a194"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/2a005250064759f206aa1b5a1ee000dcd808ef5b",
-                "reference": "2a005250064759f206aa1b5a1ee000dcd808ef5b",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/10759bbd889e38ef5d6785737db9fb119880a194",
+                "reference": "10759bbd889e38ef5d6785737db9fb119880a194",
                 "shasum": ""
             },
             "require": {
@@ -127,7 +127,7 @@
                 "psr/clock": "^1.0",
                 "psr/container": "^2.0.2",
                 "psr/event-dispatcher": "^1.0",
-                "psr/log": "^1.1.4"
+                "psr/log": "^2.0.0"
             },
             "type": "library",
             "extra": {
@@ -150,7 +150,7 @@
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
                 "source": "https://github.com/nextcloud-deps/ocp/tree/stable30"
             },
-            "time": "2024-08-14T08:51:38+00:00"
+            "time": "2025-07-04T00:53:40+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -990,30 +990,30 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.4",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376"
             },
             "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/ef29f6d262798707a9edd554e2b82517ef3a9376",
+                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
+                    "Psr\\Log\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1034,9 +1034,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.4"
+                "source": "https://github.com/php-fig/log/tree/2.0.0"
             },
-            "time": "2021-05-03T11:20:27+00:00"
+            "time": "2021-07-14T16:41:46+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -2012,8 +2012,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..359bd7369 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
+<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
   <file src="lib/Activity/ProviderParser.php">
     <TypeDoesNotContainType>
       <code><![CDATA[str_starts_with($sK, '_')]]></code>
@@ -63,6 +63,16 @@
       <code><![CDATA[hasInvitedBy]]></code>
     </UndefinedInterfaceMethod>
   </file>
+  <file src="lib/Controller/RemoteController.php">
+    <InvalidArgument>
+      <code><![CDATA[($e->getCode() > 0) ? $e->getCode() : $httpErrorCode]]></code>
+    </InvalidArgument>
+  </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 +122,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 +224,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 +236,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 +273,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 +292,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 +372,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 +399,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>