From 7db0e7c682d65500fb0b84e24d77fe6349d3f52a Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Sun, 8 Mar 2026 00:21:40 +0000
Subject: [PATCH] Remove File::isError() method

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 phpstan-baseline.neon                            |  6 ------
 psalm-baseline.xml                               |  3 ---
 src/Controllers/Import/ImportController.php      | 12 ++++--------
 src/Controllers/Preferences/ManageController.php |  5 ++---
 src/Controllers/Table/ReplaceController.php      |  5 +++--
 src/File.php                                     |  8 --------
 6 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 23789fa38b..4666b1bb8e 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3099,12 +3099,6 @@ parameters:
 			count: 1
 			path: src/Controllers/Table/ReplaceController.php
 
-		-
-			message: '#^Parameter \#1 \$messages of method PhpMyAdmin\\Message\:\:addMessagesString\(\) expects array\<string\>, list\<PhpMyAdmin\\Message\|string\|null\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Controllers/Table/ReplaceController.php
-
 		-
 			message: '#^Parameter \#2 \$relationField of method PhpMyAdmin\\InsertEdit\:\:getLinkForRelationalDisplayField\(\) expects string, \(int\|string\) given\.$#'
 			identifier: argument.type
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index b8cc474234..78b6d26894 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -2362,9 +2362,6 @@
     </PossiblyInvalidCast>
   </file>
   <file src="src/Controllers/Table/ReplaceController.php">
-    <InvalidArgument>
-      <code><![CDATA[$insertErrors]]></code>
-    </InvalidArgument>
     <InvalidPropertyAssignmentValue>
       <code><![CDATA[UrlParams::$params]]></code>
     </InvalidPropertyAssignmentValue>
diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php
index 38f0b0d795..5ca0b3b026 100644
--- a/src/Controllers/Import/ImportController.php
+++ b/src/Controllers/Import/ImportController.php
@@ -397,10 +397,8 @@ final readonly class ImportController implements InvocableController
              */
             $importHandle = new File(ImportSettings::$importFile);
             $importHandle->checkUploadedFile();
-            if ($importHandle->isError()) {
-                /** @var Message $errorMessage */
-                $errorMessage = $importHandle->getError();
-
+            $errorMessage = $importHandle->getError();
+            if ($errorMessage !== null) {
                 $importHandle->close();
 
                 $_SESSION['Import_message']['message'] = $errorMessage->getDisplay();
@@ -414,10 +412,8 @@ final readonly class ImportController implements InvocableController
 
             $importHandle->setDecompressContent(true);
             $importHandle->open();
-            if ($importHandle->isError()) {
-                /** @var Message $errorMessage */
-                $errorMessage = $importHandle->getError();
-
+            $errorMessage = $importHandle->getError();
+            if ($errorMessage !== null) {
                 $importHandle->close();
 
                 $_SESSION['Import_message']['message'] = $errorMessage->getDisplay();
diff --git a/src/Controllers/Preferences/ManageController.php b/src/Controllers/Preferences/ManageController.php
index 3ec730d69a..ce9c946e43 100644
--- a/src/Controllers/Preferences/ManageController.php
+++ b/src/Controllers/Preferences/ManageController.php
@@ -118,9 +118,8 @@ final readonly class ManageController implements InvocableController
             ) {
                 $importHandle = new File($_FILES['import_file']['tmp_name']);
                 $importHandle->checkUploadedFile();
-                if ($importHandle->isError()) {
-                    $error = $importHandle->getError();
-                } else {
+                $error = $importHandle->getError();
+                if ($error === null) {
                     // read JSON from uploaded file
                     $json = $importHandle->getRawContent();
                 }
diff --git a/src/Controllers/Table/ReplaceController.php b/src/Controllers/Table/ReplaceController.php
index 3dd65f0fb5..d256923f11 100644
--- a/src/Controllers/Table/ReplaceController.php
+++ b/src/Controllers/Table/ReplaceController.php
@@ -192,8 +192,9 @@ final readonly class ReplaceController implements InvocableController
                     }
                 }
 
-                if ($fileToInsert->isError()) {
-                    $insertErrors[] = $fileToInsert->getError();
+                $errorMessage = $fileToInsert->getError();
+                if ($errorMessage !== null) {
+                    $insertErrors[] = $errorMessage->getMessage();
                 }
 
                 // delete $file_to_insert temporary variable
diff --git a/src/File.php b/src/File.php
index d6319fca52..2d519f078a 100644
--- a/src/File.php
+++ b/src/File.php
@@ -320,14 +320,6 @@ class File
         return $this->errorMessage;
     }
 
-    /**
-     * Checks whether there was any error.
-     */
-    public function isError(): bool
-    {
-        return $this->errorMessage !== null;
-    }
-
     /**
      * checks the superglobals provided if the tbl_change form is submitted
      * and uses the submitted/selected file