From 0e3a82bd8668477a1fdad3a8f2602bc4c809ec65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 29 Jul 2020 23:08:29 -0300 Subject: [PATCH] Remove Display\Error class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Core.php | 11 ++-- libraries/classes/Display/Error.php | 51 ------------------- templates/error/generic.twig | 2 +- test/classes/Display/ErrorTest.php | 78 ----------------------------- 4 files changed, 7 insertions(+), 135 deletions(-) delete mode 100644 libraries/classes/Display/Error.php delete mode 100644 test/classes/Display/ErrorTest.php diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index e683d6ba83..d48d86143e 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin; -use PhpMyAdmin\Display\Error as DisplayError; use PhpMyAdmin\Plugins\AuthenticationPlugin; use Symfony\Component\DependencyInjection\ContainerInterface; use const DATE_RFC1123; @@ -291,11 +290,13 @@ class Core ); } else { $error_message = strtr($error_message, ['
' => '[br]']); - $error_header = __('Error'); - $lang = $GLOBALS['lang'] ?? 'en'; - $dir = $GLOBALS['text_dir'] ?? 'ltr'; + $template = new Template(); - echo DisplayError::display(new Template(), $lang, $dir, $error_header, $error_message); + echo $template->render('error/generic', [ + 'lang' => $GLOBALS['lang'] ?? 'en', + 'dir' => $GLOBALS['text_dir'] ?? 'ltr', + 'error_message' => Sanitize::sanitizeMessage($error_message), + ]); } if (! defined('TESTSUITE')) { exit; diff --git a/libraries/classes/Display/Error.php b/libraries/classes/Display/Error.php deleted file mode 100644 index b379643821..0000000000 --- a/libraries/classes/Display/Error.php +++ /dev/null @@ -1,51 +0,0 @@ -render( - 'error/generic', - [ - 'lang' => $lang, - 'dir' => $dir, - 'error_header' => $errorHeader, - 'error_message' => Sanitize::sanitizeMessage($errorMessage), - ] - ); - } -} diff --git a/templates/error/generic.twig b/templates/error/generic.twig index a47bce6054..5e9f856a51 100644 --- a/templates/error/generic.twig +++ b/templates/error/generic.twig @@ -34,7 +34,7 @@ -

phpMyAdmin - {{ error_header }}

+

phpMyAdmin - {% trans 'Error' %}

{{ error_message|raw }}

diff --git a/test/classes/Display/ErrorTest.php b/test/classes/Display/ErrorTest.php deleted file mode 100644 index 4d3ad19e17..0000000000 --- a/test/classes/Display/ErrorTest.php +++ /dev/null @@ -1,78 +0,0 @@ -assertStringContainsString( - '', - $html - ); - $this->assertStringContainsString( - 'Failure', - $html - ); - } - - /** - * Test for Error::display - * - * @throws Throwable - * @throws LoaderError - * @throws RuntimeError - * @throws SyntaxError - */ - public function testDisplayToSanitize(): void - { - $lang = 'fr'; - $dir = 'ltr'; - $error_header = 'Error'; - $error_message = '[em]Failure[/em]'; - - $html = Error::display(new Template(), $lang, $dir, $error_header, $error_message); - - $this->assertStringContainsString( - '', - $html - ); - $this->assertStringContainsString( - 'Failure', - $html - ); - } -}