From 5335b3feb8b9f4aa9055e13cf1f63a9e76b4bb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sat, 27 Mar 2021 14:46:38 -0300
Subject: [PATCH] Fix PHP 8.1 failing tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/Html/Generator.php | 4 ++--
 libraries/classes/InsertEdit.php     | 9 +++++----
 libraries/classes/Message.php        | 3 ++-
 libraries/classes/Util.php           | 5 +++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
index 6d4661ea4f..0b799a6ff3 100644
--- a/libraries/classes/Html/Generator.php
+++ b/libraries/classes/Html/Generator.php
@@ -606,7 +606,7 @@ class Generator
                     . '</pre></code>';
             } elseif ($query_too_big) {
                 $query_base = '<code class="sql"><pre>' . "\n" .
-                    htmlspecialchars($query_base) .
+                    htmlspecialchars($query_base, ENT_COMPAT) .
                     '</pre></code>';
             } else {
                 $query_base = self::formatSql($query_base);
@@ -1309,7 +1309,7 @@ class Generator
         }
 
         return '<code class="sql"><pre>' . "\n"
-            . htmlspecialchars($sqlQuery) . "\n"
+            . htmlspecialchars($sqlQuery, ENT_COMPAT) . "\n"
             . '</pre></code>';
     }
 
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index f5ab9c627e..bbed164dd0 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -10,6 +10,7 @@ namespace PhpMyAdmin;
 use PhpMyAdmin\Controllers\Table\ChangeController;
 use PhpMyAdmin\Html\Generator;
 use PhpMyAdmin\Plugins\TransformationsPlugin;
+use const ENT_COMPAT;
 use const PASSWORD_DEFAULT;
 use function array_fill;
 use function array_flip;
@@ -2067,7 +2068,7 @@ class InsertEdit
                 : Util::addMicroseconds(
                     $current_row[$column['Field']]
                 );
-            $special_chars = htmlspecialchars($current_row[$column['Field']]);
+            $special_chars = htmlspecialchars($current_row[$column['Field']], ENT_COMPAT);
         } elseif (in_array($column['True_Type'], $gis_data_types)) {
             // Convert gis data to Well Know Text format
             $current_row[$column['Field']] = $as_is
@@ -2076,7 +2077,7 @@ class InsertEdit
                     $current_row[$column['Field']],
                     true
                 );
-            $special_chars = htmlspecialchars($current_row[$column['Field']]);
+            $special_chars = htmlspecialchars($current_row[$column['Field']], ENT_COMPAT);
         } else {
             // special binary "characters"
             if ($column['is_binary']
@@ -2088,7 +2089,7 @@ class InsertEdit
                         $current_row[$column['Field']]
                     );
             }
-            $special_chars = htmlspecialchars($current_row[$column['Field']]);
+            $special_chars = htmlspecialchars($current_row[$column['Field']], ENT_COMPAT);
 
             //We need to duplicate the first \n or otherwise we will lose
             //the first newline entered in a VARCHAR or TEXT column
@@ -2115,7 +2116,7 @@ class InsertEdit
         // it's better to set a fields_prev in this situation
         $backup_field = '<input type="hidden" name="fields_prev'
             . $column_name_appendix . '" value="'
-            . htmlspecialchars($current_row[$column['Field']]) . '">';
+            . htmlspecialchars($current_row[$column['Field']], ENT_COMPAT) . '">';
 
         return [
             $real_null_value,
diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php
index 17609d2fba..6ece88e55f 100644
--- a/libraries/classes/Message.php
+++ b/libraries/classes/Message.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin;
 
+use const ENT_COMPAT;
 use function array_unshift;
 use function count;
 use function htmlspecialchars;
@@ -462,7 +463,7 @@ class Message
         if ($param instanceof self || is_float($param) || is_int($param)) {
             $this->params[] = $param;
         } else {
-            $this->params[] = htmlspecialchars((string) $param);
+            $this->params[] = htmlspecialchars((string) $param, ENT_COMPAT);
         }
     }
 
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 5961766213..133d3c95eb 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1524,7 +1524,7 @@ class Util
         }
 
         // for the case ENUM('&#8211;','&ldquo;')
-        $displayed_type = htmlspecialchars($printtype);
+        $displayed_type = htmlspecialchars($printtype, ENT_COMPAT);
         if (mb_strlen($printtype) > $GLOBALS['cfg']['LimitChars']) {
             $displayed_type  = '<abbr title="' . htmlspecialchars($printtype) . '">';
             $displayed_type .= htmlspecialchars(
@@ -1532,7 +1532,8 @@ class Util
                     $printtype,
                     0,
                     (int) $GLOBALS['cfg']['LimitChars']
-                ) . '...'
+                ) . '...',
+                ENT_COMPAT
             );
             $displayed_type .= '</abbr>';
         }