From 1ef3777911bbfe01fc8d706365eb67d88d42361f Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Fri, 12 May 2023 21:19:20 +0100
Subject: [PATCH] Update ImportMediawiki.php

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 libraries/classes/Plugins/Import/ImportMediawiki.php | 2 +-
 phpstan-baseline.neon                                | 5 -----
 psalm-baseline.xml                                   | 2 --
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php
index dce895829e..b367dfb606 100644
--- a/libraries/classes/Plugins/Import/ImportMediawiki.php
+++ b/libraries/classes/Plugins/Import/ImportMediawiki.php
@@ -516,7 +516,7 @@ class ImportMediawiki extends ImportPlugin
      *
      * @param string $cell Cell
      */
-    private function getCellData(string $cell): mixed
+    private function getCellData(string $cell): string
     {
         // A cell could contain both parameters and data
         $cellData = explode('|', $cell, 2);
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index ffa9b28409..e280d8a2c8 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -6195,11 +6195,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Plugins/Import/ImportMediawiki.php
 
-		-
-			message: "#^Parameter \\#1 \\$string of function trim expects string, mixed given\\.$#"
-			count: 1
-			path: libraries/classes/Plugins/Import/ImportMediawiki.php
-
 		-
 			message: "#^Parameter \\#2 \\$tableRow of method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportMediawiki\\:\\:setTableHeaders\\(\\) expects array, mixed given\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 8508c73029..84056bd61a 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -10307,7 +10307,6 @@
       <code><![CDATA[$GLOBALS['timeout_passed']]]></code>
     </InvalidArrayOffset>
     <MixedArgument>
-      <code>$cell</code>
       <code>$cell</code>
       <code>$table[0]</code>
       <code>$table[1]</code>
@@ -10319,7 +10318,6 @@
     <MixedAssignment>
       <code><![CDATA[$GLOBALS['timeout_passed']]]></code>
       <code>$cell</code>
-      <code>$cell</code>
     </MixedAssignment>
     <PossiblyUndefinedArrayOffset>
       <code>$cellData[1]</code>