diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 515d74ff13..6d1a888b9d 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -6095,6 +6095,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Pdf.php
 
+		-
+			message: "#^Call to an undefined method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyItem\\:\\:getProperties\\(\\)\\.$#"
+			count: 1
+			path: libraries/classes/Plugins.php
+
 		-
 			message: "#^Call to function method_exists\\(\\) with PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyItem and 'getText' will always evaluate to true\\.$#"
 			count: 1
@@ -7410,51 +7415,21 @@ parameters:
 			count: 1
 			path: libraries/classes/Plugins/UploadInterface.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyGroup\\:\\:getProperties\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Properties/Options/OptionsPropertyGroup.php
-
-		-
-			message: "#^Property PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyGroup\\:\\:\\$properties type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Properties/Options/OptionsPropertyGroup.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyOneItem\\:\\:getDoc\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Properties/Options/OptionsPropertyOneItem.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyOneItem\\:\\:getValues\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: libraries/classes/Properties/Options/OptionsPropertyOneItem.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyOneItem\\:\\:setDoc\\(\\) has parameter \\$doc with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Properties/Options/OptionsPropertyOneItem.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyOneItem\\:\\:setValues\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: libraries/classes/Properties/Options/OptionsPropertyOneItem.php
 
-		-
-			message: "#^Property PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyOneItem\\:\\:\\$doc type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Properties/Options/OptionsPropertyOneItem.php
-
 		-
 			message: "#^Property PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyOneItem\\:\\:\\$values type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: libraries/classes/Properties/Options/OptionsPropertyOneItem.php
 
-		-
-			message: "#^Return type \\(bool\\|string\\) of method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyOneItem\\:\\:getForce\\(\\) should be covariant with return type \\(string\\|null\\) of method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyItem\\:\\:getForce\\(\\)$#"
-			count: 1
-			path: libraries/classes/Properties/Options/OptionsPropertyOneItem.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Providers\\\\ServerVariables\\\\MariaDbMySqlKbsProvider\\:\\:getStaticVariables\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -11495,6 +11470,11 @@ parameters:
 			count: 5
 			path: test/classes/Plugins/Export/ExportOdtTest.php
 
+		-
+			message: "#^Call to an undefined method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyItem\\:\\:getProperties\\(\\)\\.$#"
+			count: 1
+			path: test/classes/Plugins/Export/ExportSqlTest.php
+
 		-
 			message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
 			count: 2
@@ -11566,7 +11546,7 @@ parameters:
 			path: test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php
 
 		-
-			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'PhpMyAdmin\\\\\\\\Properties\\\\\\\\Options\\\\\\\\OptionsPropertyGroup' and PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyGroup will always evaluate to true\\.$#"
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'PhpMyAdmin\\\\\\\\Properties\\\\\\\\Options\\\\\\\\OptionsPropertyGroup' and PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyGroup&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject will always evaluate to true\\.$#"
 			count: 1
 			path: test/classes/Properties/Options/OptionsPropertyGroupTest.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 772d4295d3..68508c5690 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -13485,11 +13485,6 @@
       <code><![CDATA[$this->properties === null]]></code>
     </DocblockTypeContradiction>
   </file>
-  <file src="libraries/classes/Properties/Options/OptionsPropertyOneItem.php">
-    <ImplementedReturnTypeMismatch>
-      <code>bool|string</code>
-    </ImplementedReturnTypeMismatch>
-  </file>
   <file src="libraries/classes/Query/Cache.php">
     <MixedArrayAccess>
       <code><![CDATA[$this->tableCache[$one_database][$table]]]></code>