diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index b1fb9df463..462384e1fd 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -780,11 +780,31 @@ parameters:
 			count: 1
 			path: libraries/classes/Command/TwigLintCommand.php
 
+		-
+			message: "#^Offset 'date' does not exist on array\\<string, string\\>\\|string\\.$#"
+			count: 2
+			path: libraries/classes/Command/WriteGitRevisionCommand.php
+
+		-
+			message: "#^Offset 'email' does not exist on array\\<string, string\\>\\|string\\.$#"
+			count: 2
+			path: libraries/classes/Command/WriteGitRevisionCommand.php
+
+		-
+			message: "#^Offset 'name' does not exist on array\\<string, string\\>\\|string\\.$#"
+			count: 2
+			path: libraries/classes/Command/WriteGitRevisionCommand.php
+
 		-
 			message: "#^PHPDoc type string of property PhpMyAdmin\\\\Command\\\\WriteGitRevisionCommand\\:\\:\\$defaultName is not the same as PHPDoc type string\\|null of overridden property Symfony\\\\Component\\\\Console\\\\Command\\\\Command\\:\\:\\$defaultName\\.$#"
 			count: 1
 			path: libraries/classes/Command/WriteGitRevisionCommand.php
 
+		-
+			message: "#^Parameter \\#1 \\$str of function trim expects string, array\\<string, string\\>\\|string given\\.$#"
+			count: 1
+			path: libraries/classes/Command/WriteGitRevisionCommand.php
+
 		-
 			message: "#^Cannot access offset 'Server' on mixed\\.$#"
 			count: 1
@@ -15567,12 +15587,7 @@ parameters:
 
 		-
 			message: "#^Method PhpMyAdmin\\\\Dbal\\\\MysqliResult\\:\\:fetchAllKeyPair\\(\\) should return array\\<string, string\\|null\\> but returns array\\.$#"
-			count: 1
-			path: libraries/classes/Dbal/MysqliResult.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Dbal\\\\MysqliResult\\:\\:fetchAllKeyPair\\(\\) should return array\\<string, string\\|null\\> but returns array\\<int\\|string, mixed\\>\\.$#"
-			count: 1
+			count: 2
 			path: libraries/classes/Dbal/MysqliResult.php
 
 		-
@@ -19455,6 +19470,21 @@ parameters:
 			count: 1
 			path: libraries/classes/Git.php
 
+		-
+			message: "#^Cannot access offset 'date' on mixed\\.$#"
+			count: 2
+			path: libraries/classes/Git.php
+
+		-
+			message: "#^Cannot access offset 'email' on mixed\\.$#"
+			count: 2
+			path: libraries/classes/Git.php
+
+		-
+			message: "#^Cannot access offset 'name' on mixed\\.$#"
+			count: 2
+			path: libraries/classes/Git.php
+
 		-
 			message: "#^Cannot access offset 1 on array\\|false\\.$#"
 			count: 2
@@ -19495,11 +19525,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Git.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Git\\:\\:extractDataFormTextBody\\(\\) has parameter \\$commit with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Git.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Git\\:\\:getHashFromHeadRef\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -19551,7 +19576,7 @@ parameters:
 			path: libraries/classes/Git.php
 
 		-
-			message: "#^Parameter \\#1 \\$commit of method PhpMyAdmin\\\\Git\\:\\:extractDataFormTextBody\\(\\) expects array, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$commit of static method PhpMyAdmin\\\\Git\\:\\:extractDataFormTextBody\\(\\) expects array\\<string\\>, mixed given\\.$#"
 			count: 1
 			path: libraries/classes/Git.php
 
@@ -19616,7 +19641,7 @@ parameters:
 			path: libraries/classes/Git.php
 
 		-
-			message: "#^Parameter \\#2 \\$str of function explode expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$str of function explode expects string, string\\|null given\\.$#"
 			count: 1
 			path: libraries/classes/Git.php
 
@@ -45090,6 +45115,16 @@ parameters:
 			count: 1
 			path: test/classes/Gis/GisPolygonTest.php
 
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertIsArray\\(\\) with array will always evaluate to true\\.$#"
+			count: 1
+			path: test/classes/GitTest.php
+
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNotNull\\(\\) with array will always evaluate to true\\.$#"
+			count: 1
+			path: test/classes/GitTest.php
+
 		-
 			message: "#^Dynamic call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:markTestSkipped\\(\\)\\.$#"
 			count: 2
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 461a1924a4..47ff2d32a5 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -266,9 +266,28 @@
     </UnusedVariable>
   </file>
   <file src="libraries/classes/Command/WriteGitRevisionCommand.php">
+    <MixedArgument occurrences="6">
+      <code>$author['date']</code>
+      <code>$author['email']</code>
+      <code>$author['name']</code>
+      <code>$committer['date']</code>
+      <code>$committer['email']</code>
+      <code>$committer['name']</code>
+    </MixedArgument>
     <NonInvariantDocblockPropertyType occurrences="1">
       <code>$defaultName</code>
     </NonInvariantDocblockPropertyType>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$message</code>
+    </PossiblyInvalidArgument>
+    <PossiblyInvalidArrayOffset occurrences="6">
+      <code>$author['date']</code>
+      <code>$author['email']</code>
+      <code>$author['name']</code>
+      <code>$committer['date']</code>
+      <code>$committer['email']</code>
+      <code>$committer['name']</code>
+    </PossiblyInvalidArrayOffset>
   </file>
   <file src="libraries/classes/Common.php">
     <MixedArgument occurrences="5">
@@ -6744,26 +6763,28 @@
     <InvalidArgument occurrences="1">
       <code>$params</code>
     </InvalidArgument>
+    <InvalidReturnStatement occurrences="1">
+      <code>is_array($info) ? $info : []</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>array{revision: string, revisionUrl: string, branch: string, branchUrl: string}|[]</code>
+    </InvalidReturnType>
     <MixedArgument occurrences="2">
       <code>$db</code>
       <code>$table</code>
     </MixedArgument>
-    <MixedAssignment occurrences="4">
-      <code>$info</code>
+    <MixedAssignment occurrences="3">
       <code>$params['route']</code>
       <code>$params['server']</code>
       <code>$subObject</code>
     </MixedAssignment>
-    <MixedReturnTypeCoercion occurrences="2">
-      <code>array{revision: string, revisionUrl: string, branch: string, branchUrl: string}|[]</code>
-      <code>is_array($info) ? $info : []</code>
-    </MixedReturnTypeCoercion>
     <RedundantCast occurrences="3">
       <code>(string) $GLOBALS['db']</code>
       <code>(string) $GLOBALS['table']</code>
       <code>(string) $_REQUEST['no_history']</code>
     </RedundantCast>
-    <RedundantCondition occurrences="4">
+    <RedundantCondition occurrences="5">
+      <code>is_array($info)</code>
       <code>is_scalar($GLOBALS['db'])</code>
       <code>is_scalar($GLOBALS['table'])</code>
       <code>isset($GLOBALS['db']) &amp;&amp; is_scalar($GLOBALS['db'])</code>
@@ -6772,6 +6793,9 @@
     <TypeDoesNotContainNull occurrences="2">
       <code>! isset($dbi)</code>
     </TypeDoesNotContainNull>
+    <TypeDoesNotContainType occurrences="1">
+      <code>[]</code>
+    </TypeDoesNotContainType>
   </file>
   <file src="libraries/classes/Gis/GisGeometry.php">
     <MixedArgument occurrences="7">
@@ -7542,22 +7566,25 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="libraries/classes/Git.php">
-    <MixedArgument occurrences="8">
+    <MixedArgument occurrences="7">
       <code>$commit</code>
       <code>$commit_json-&gt;message</code>
-      <code>$dataline</code>
       <code>$hash</code>
       <code>$hash</code>
       <code>$hash</code>
       <code>$offset + ($position * 20)</code>
       <code>$offset + ($position * 4)</code>
     </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="1">
+    <MixedArrayAccess occurrences="6">
+      <code>$info['author']['date']</code>
+      <code>$info['author']['email']</code>
+      <code>$info['author']['name']</code>
+      <code>$info['committer']['date']</code>
+      <code>$info['committer']['email']</code>
+      <code>$info['committer']['name']</code>
+    </MixedArrayAccess>
+    <MixedAssignment occurrences="9">
       <code>$commit</code>
-    </MixedArgumentTypeCoercion>
-    <MixedAssignment occurrences="10">
-      <code>$commit</code>
-      <code>$dataline</code>
       <code>$end</code>
       <code>$git_location</code>
       <code>$isRemoteCommit</code>
@@ -15517,6 +15544,11 @@
       <code>$queryString</code>
     </MixedAssignment>
   </file>
+  <file src="test/classes/GitTest.php">
+    <RedundantConditionGivenDocblockType occurrences="1">
+      <code>assertIsArray</code>
+    </RedundantConditionGivenDocblockType>
+  </file>
   <file src="test/classes/HeaderTest.php">
     <MixedInferredReturnType occurrences="1">
       <code>array</code>