diff --git a/composer.lock b/composer.lock
index 5802a9e7cb..b6d4302848 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8599,16 +8599,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "6.13.1",
+            "version": "6.14.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51"
+                "reference": "d0b040a91f280f071c1abcb1b77ce3822058725a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51",
-                "reference": "1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/d0b040a91f280f071c1abcb1b77ce3822058725a",
+                "reference": "d0b040a91f280f071c1abcb1b77ce3822058725a",
                 "shasum": ""
             },
             "require": {
@@ -8631,11 +8631,11 @@
                 "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0",
                 "netresearch/jsonmapper": "^5.0",
                 "nikic/php-parser": "^5.0.0",
-                "php": "~8.1.31 || ~8.2.27 || ~8.3.16 || ~8.4.3",
+                "php": "~8.1.31 || ~8.2.27 || ~8.3.16 || ~8.4.3 || ~8.5.0",
                 "sebastian/diff": "^4.0 || ^5.0 || ^6.0 || ^7.0",
                 "spatie/array-to-xml": "^2.17.0 || ^3.0",
-                "symfony/console": "^6.0 || ^7.0",
-                "symfony/filesystem": "~6.3.12 || ~6.4.3 || ^7.0.3",
+                "symfony/console": "^6.0 || ^7.0 || ^8.0",
+                "symfony/filesystem": "~6.3.12 || ~6.4.3 || ^7.0.3 || ^8.0",
                 "symfony/polyfill-php84": "^1.31.0"
             },
             "provide": {
@@ -8657,7 +8657,7 @@
                 "psalm/plugin-phpunit": "^0.19",
                 "slevomat/coding-standard": "^8.4",
                 "squizlabs/php_codesniffer": "^3.6",
-                "symfony/process": "^6.0 || ^7.0"
+                "symfony/process": "^6.0 || ^7.0 || ^8.0"
             },
             "suggest": {
                 "ext-curl": "In order to send data to shepherd",
@@ -8713,7 +8713,7 @@
                 "issues": "https://github.com/vimeo/psalm/issues",
                 "source": "https://github.com/vimeo/psalm"
             },
-            "time": "2025-08-06T10:10:28+00:00"
+            "time": "2025-12-23T15:36:48+00:00"
         },
         {
             "name": "web-auth/cose-lib",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index f3fbcbe986..77fbd514be 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -15882,7 +15882,7 @@ parameters:
 				Use dependency injection instead\.$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 1
+			count: 2
 			path: tests/unit/Database/RoutinesTest.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 361c6d5a03..a5834acbc1 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
+<files psalm-version="6.14.3@d0b040a91f280f071c1abcb1b77ce3822058725a">
   <file src="src/Advisory/Advisor.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$pattern]]></code>
@@ -53,6 +53,7 @@
       <code><![CDATA[$row]]></code>
     </InvalidArgument>
     <PossiblyNullArrayOffset>
+      <code><![CDATA[self::$charsets]]></code>
       <code><![CDATA[self::$charsets]]></code>
       <code><![CDATA[self::$collations]]></code>
       <code><![CDATA[self::$collations[$row['Charset']]]]></code>
@@ -629,6 +630,7 @@
       <code><![CDATA[$key]]></code>
     </PossiblyNullArgument>
     <PossiblyNullArrayOffset>
+      <code><![CDATA[$userGroups]]></code>
       <code><![CDATA[$userGroups]]></code>
       <code><![CDATA[$userGroups]]></code>
       <code><![CDATA[$userGroups[$groupName]]]></code>
@@ -1175,6 +1177,9 @@
     <PossiblyNullArgument>
       <code><![CDATA[$currentTable['TABLE_NAME']]]></code>
     </PossiblyNullArgument>
+    <PossiblyNullArrayOffset>
+      <code><![CDATA[$trackedTables]]></code>
+    </PossiblyNullArrayOffset>
     <PossiblyNullOperand>
       <code><![CDATA[$columnNames]]></code>
       <code><![CDATA[$currentTable['Data_length']]]></code>
@@ -3629,6 +3634,7 @@
       <code><![CDATA[$resultRows]]></code>
       <code><![CDATA[$resultTarget]]></code>
       <code><![CDATA[$resultTarget]]></code>
+      <code><![CDATA[$resultTarget]]></code>
     </PossiblyNullArrayOffset>
     <PossiblyNullOperand>
       <code><![CDATA[$row['Data_free']]]></code>
@@ -4228,6 +4234,9 @@
       <code><![CDATA[$this->getName()]]></code>
       <code><![CDATA[$this->getName()]]></code>
     </PossiblyNullArgument>
+    <PossiblyNullArrayOffset>
+      <code><![CDATA[$_REQUEST['fields_uploadlocal']['multi_edit']]]></code>
+    </PossiblyNullArrayOffset>
     <PossiblyUnusedMethod>
       <code><![CDATA[getCharset]]></code>
       <code><![CDATA[getChunkSize]]></code>
@@ -5140,6 +5149,7 @@
     <PossiblyNullArrayOffset>
       <code><![CDATA[$hidden]]></code>
       <code><![CDATA[$hidden]]></code>
+      <code><![CDATA[$hidden]]></code>
     </PossiblyNullArrayOffset>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[empty($_POST['full'])]]></code>
@@ -6060,6 +6070,9 @@
       <code><![CDATA[$oldTable]]></code>
       <code><![CDATA[$oldTable]]></code>
     </PossiblyNullArgument>
+    <PossiblyNullArrayOffset>
+      <code><![CDATA[Charsets::$mysqlCharsetMap]]></code>
+    </PossiblyNullArrayOffset>
     <PossiblyNullOperand>
       <code><![CDATA[$eventDef]]></code>
     </PossiblyNullOperand>
@@ -7704,6 +7717,7 @@
       <code><![CDATA[$dbRights]]></code>
       <code><![CDATA[$dbRights]]></code>
       <code><![CDATA[$dbRights]]></code>
+      <code><![CDATA[$dbRights]]></code>
       <code><![CDATA[$dbRights[$row['User']]]]></code>
       <code><![CDATA[$groupAssignment]]></code>
       <code><![CDATA[$groupAssignment]]></code>
@@ -8157,6 +8171,9 @@
       <code><![CDATA[$mysqlVars]]></code>
       <code><![CDATA[$mysqlVars]]></code>
       <code><![CDATA[$mysqlVars]]></code>
+      <code><![CDATA[$mysqlVars]]></code>
+      <code><![CDATA[$mysqlVars]]></code>
+      <code><![CDATA[$variables]]></code>
       <code><![CDATA[$variables]]></code>
     </PossiblyNullArrayOffset>
   </file>
@@ -8289,6 +8306,7 @@
     </PossiblyInvalidOperand>
     <PossiblyNullArrayOffset>
       <code><![CDATA[$geomFuncs]]></code>
+      <code><![CDATA[$geomUnaryFunctions]]></code>
     </PossiblyNullArrayOffset>
     <PossiblyNullOperand>
       <code><![CDATA[$geomFunc]]></code>
@@ -10022,6 +10040,7 @@
   </file>
   <file src="tests/unit/Database/RoutinesTest.php">
     <DeprecatedMethod>
+      <code><![CDATA[Config::getInstance()]]></code>
       <code><![CDATA[Config::getInstance()]]></code>
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>