phpmyadmin
diff --git a/‎src/Error/ErrorHandler.php‎
Lines changed: 14 additions & 54 deletions b/‎src/Error/ErrorHandler.php‎
Lines changed: 14 additions & 54 deletions
diff --git a/‎tests/unit/Error/ErrorHandlerTest.php‎
Lines changed: 0 additions & 39 deletions b/‎tests/unit/Error/ErrorHandlerTest.php‎
Lines changed: 0 additions & 39 deletions
@@ -16,6 +16,7 @@
 use Throwable;
 
 use function __;
+use function array_filter;
 use function array_splice;
 use function count;
 use function defined;
@@ -44,7 +45,7 @@
  */
 class ErrorHandler
 {
-    public static self|null $instance = null;
+    private static self|null $instance = null;
 
     /**
      * holds errors to be displayed or reported later ...
@@ -343,7 +344,7 @@ public function dispUserErrors(): void
     /**
      * Renders user errors not displayed
      */
-    public function getDispUserErrors(): string
+    private function getDispUserErrors(): string
     {
         $retval = '';
         foreach ($this->getErrors() as $error) {
@@ -377,9 +378,7 @@ public function getDispErrors(): string
             $retval .= $this->getDispUserErrors();
         }
 
-        // if preference is not 'never' and
-        // there are 'actual' errors to be reported
-        if ($config->settings['SendErrorReports'] !== 'never' && $this->countErrors() !== $this->countUserErrors()) {
+        if ($config->settings['SendErrorReports'] !== 'never' && $this->countActualErrors() !== 0) {
             // add report button.
             $retval .= '<form method="post" action="' . Url::getFromRoute('/error-report')
                     . '" id="pma_report_errors_form"';
@@ -422,7 +421,7 @@ public function getDispErrors(): string
     /**
      * look in session for saved errors
      */
-    protected function checkSavedErrors(): void
+    private function checkSavedErrors(): void
     {
         if (! isset($_SESSION['errors'])) {
             return;
@@ -454,63 +453,26 @@ public function countErrors(bool $check = true): int
         return count($this->getErrors($check));
     }
 
-    /**
-     * return count of user errors
-     *
-     * @return int number of user errors occurred
-     */
     public function countUserErrors(): int
     {
-        $count = 0;
-        if ($this->countErrors() !== 0) {
-            foreach ($this->getErrors() as $error) {
-                if (! $error->isUserError()) {
-                    continue;
-                }
-
-                $count++;
-            }
-        }
-
-        return $count;
+        return count(array_filter($this->getErrors(), static fn (Error $error): bool => $error->isUserError()));
     }
 
-    /**
-     * whether use errors occurred or not
-     */
-    public function hasUserErrors(): bool
+    private function countActualErrors(): int
     {
-        return (bool) $this->countUserErrors();
+        return count(array_filter($this->getErrors(), static fn (Error $error): bool => ! $error->isUserError()));
     }
 
     /**
-     * whether errors occurred or not
-     */
-    public function hasErrors(): bool
-    {
-        return (bool) $this->countErrors();
-    }
-
-    /**
-     * number of errors to be displayed
-     *
-     * @return int number of errors to be displayed
+     * whether there are errors to display or not
      */
-    public function countDisplayErrors(): int
+    public function hasDisplayErrors(): bool
     {
         if (Config::getInstance()->settings['SendErrorReports'] !== 'never') {
-            return $this->countErrors();
+            return $this->getErrors() !== [];
         }
 
-        return $this->countUserErrors();
-    }
-
-    /**
-     * whether there are errors to display or not
-     */
-    public function hasDisplayErrors(): bool
-    {
-        return (bool) $this->countDisplayErrors();
+        return $this->countUserErrors() !== 0;
     }
 
     /**
@@ -534,7 +496,7 @@ public function savePreviousErrors(): void
     public function hasErrorsForPrompt(): bool
     {
         return Config::getInstance()->settings['SendErrorReports'] !== 'never'
-            && $this->countErrors() !== $this->countUserErrors();
+            && $this->countActualErrors() !== 0;
     }
 
     /**
@@ -544,9 +506,7 @@ public function hasErrorsForPrompt(): bool
      */
     public function reportErrors(): void
     {
-        // if there're no actual errors,
-        if (! $this->hasErrors() || $this->countErrors() === $this->countUserErrors()) {
-            // then simply return.
+        if ($this->getErrors() === [] || $this->countActualErrors() === 0) {
             return;
         }
 
 
@@ -67,7 +67,6 @@ protected function tearDown(): void
 
     public function testUniqueness(): void
     {
-        ErrorHandler::$instance = null;
         $instanceOne = ErrorHandler::getInstance();
         $instanceTwo = ErrorHandler::getInstance();
         self::assertSame($instanceOne, $instanceTwo);
@@ -248,44 +247,6 @@ public function testCountUserErrors(): void
         );
     }
 
-    /**
-     * Test for hasUserErrors
-     */
-    public function testHasUserErrors(): void
-    {
-        self::assertFalse($this->object->hasUserErrors());
-    }
-
-    /**
-     * Test for hasErrors
-     */
-    public function testHasErrors(): void
-    {
-        self::assertFalse($this->object->hasErrors());
-    }
-
-    /**
-     * Test for countDisplayErrors
-     */
-    public function testCountDisplayErrorsForDisplayTrue(): void
-    {
-        self::assertSame(
-            0,
-            $this->object->countDisplayErrors(),
-        );
-    }
-
-    /**
-     * Test for countDisplayErrors
-     */
-    public function testCountDisplayErrorsForDisplayFalse(): void
-    {
-        self::assertSame(
-            0,
-            $this->object->countDisplayErrors(),
-        );
-    }
-
     /**
      * Test for hasDisplayErrors
      */