' . "\n";
- $context = $message->getContext();
-
$message->isDisplayed(true);
- $retval .= '
getContext();
$retval .= ' border-top-0 border-start-0 border-end-0 rounded-bottom-0 mb-0" role="alert">' . "\n";
$retval .= ' ' . $message->getMessage() . "\n";
$retval .= '
' . "\n";
diff --git a/src/Message.php b/src/Message.php
index 0f22a41ee0..666dfad239 100644
--- a/src/Message.php
+++ b/src/Message.php
@@ -47,10 +47,6 @@ use const ENT_COMPAT;
*/
class Message implements Stringable
{
- public const SUCCESS = 1; // 0001
- public const NOTICE = 2; // 0010
- public const ERROR = 8; // 1000
-
/**
* The locale string identifier
*/
@@ -92,14 +88,11 @@ class Message implements Stringable
/**
* @param string $string The message to be displayed
- * @param int $type A numeric representation of the type of message
- * @param mixed[] $params An array of parameters to use in the message
- * constant definitions above
- * @psalm-param self::SUCCESS|self::NOTICE|self::ERROR $type
+ * @param mixed[] $params An array of parameters to use in the message constant definitions above
*/
public function __construct(
string $string = '',
- private int $type = self::NOTICE,
+ private MessageType $type = MessageType::Notice,
array $params = [],
) {
$this->setString($string);
@@ -129,7 +122,7 @@ class Message implements Stringable
$string = __('Your SQL query has been executed successfully.');
}
- return new Message($string, self::SUCCESS);
+ return new Message($string, MessageType::Success);
}
/**
@@ -145,7 +138,7 @@ class Message implements Stringable
$string = __('Error');
}
- return new Message($string, self::ERROR);
+ return new Message($string, MessageType::Error);
}
/**
@@ -160,7 +153,7 @@ class Message implements Stringable
*/
public static function notice(string $string): self
{
- return new Message($string, self::NOTICE);
+ return new Message($string, MessageType::Notice);
}
/**
@@ -169,10 +162,8 @@ class Message implements Stringable
* shorthand for getting a customized message
*
* @param string $message A localized string
- * @param int $type A numeric representation of the type of message
- * @psalm-param self::SUCCESS|self::NOTICE|self::ERROR $type
*/
- public static function raw(string $message, int $type = self::NOTICE): self
+ public static function raw(string $message, MessageType $type = MessageType::Notice): self
{
$r = new Message('', $type);
$r->setMessage($message);
@@ -241,7 +232,7 @@ class Message implements Stringable
*/
public static function rawError(string $message): self
{
- return self::raw($message, self::ERROR);
+ return self::raw($message, MessageType::Error);
}
/**
@@ -265,22 +256,22 @@ class Message implements Stringable
*/
public static function rawSuccess(string $message): self
{
- return self::raw($message, self::SUCCESS);
+ return self::raw($message, MessageType::Success);
}
public function isSuccess(): bool
{
- return $this->type === self::SUCCESS;
+ return $this->type === MessageType::Success;
}
public function isNotice(): bool
{
- return $this->type === self::NOTICE;
+ return $this->type === MessageType::Notice;
}
public function isError(): bool
{
- return $this->type === self::ERROR;
+ return $this->type === MessageType::Error;
}
/**
@@ -313,13 +304,7 @@ class Message implements Stringable
$this->string = $string;
}
- /**
- * set message type type
- *
- * @param int $type message type type to set
- * @psalm-param self::SUCCESS|self::NOTICE|self::ERROR $type
- */
- public function setType(int $type): void
+ public function setType(MessageType $type): void
{
$this->type = $type;
}
@@ -470,7 +455,7 @@ class Message implements Stringable
public function getHash(): string
{
if ($this->hash === null) {
- $this->hash = md5($this->type . $this->string . $this->message);
+ $this->hash = md5($this->type->getNumericalValue() . $this->string . $this->message);
}
return $this->hash;
@@ -527,26 +512,17 @@ class Message implements Stringable
return $this->string;
}
- /**
- * returns level of message
- *
- * @return string level of message
- */
- public function getLevel(): string
+ protected function getLevel(): MessageType
{
- return match ($this->type) {
- self::SUCCESS => 'success',
- self::NOTICE => 'notice',
- self::ERROR => 'error'
- };
+ return $this->type;
}
public function getContext(): string
{
return match ($this->getLevel()) {
- 'error' => 'danger',
- 'success' => 'success',
- default => 'primary',
+ MessageType::Error => 'danger',
+ MessageType::Success => 'success',
+ MessageType::Notice => 'primary',
};
}
@@ -559,11 +535,9 @@ class Message implements Stringable
{
$this->isDisplayed(true);
- $context = $this->getContext();
-
$template = new Template();
- return $template->render('message', ['context' => $context, 'message' => $this->getMessage()]);
+ return $template->render('message', ['context' => $this->getContext(), 'message' => $this->getMessage()]);
}
/**
@@ -592,9 +566,9 @@ class Message implements Stringable
public function getMessageWithIcon(string $message): string
{
$image = match ($this->getLevel()) {
- 'error' => 's_error',
- 'success' => 's_success',
- default =>'s_notice',
+ MessageType::Error => 's_error',
+ MessageType::Success => 's_success',
+ MessageType::Notice =>'s_notice',
};
return self::notice(Html\Generator::getImage($image)) . ' ' . $message;
diff --git a/src/MessageType.php b/src/MessageType.php
new file mode 100644
index 0000000000..16f3e4d195
--- /dev/null
+++ b/src/MessageType.php
@@ -0,0 +1,24 @@
+ '1',
+ self::Notice => '2',
+ self::Error => '8',
+ };
+ }
+}
diff --git a/src/Server/Privileges.php b/src/Server/Privileges.php
index 0b3372a014..a8ddb9025f 100644
--- a/src/Server/Privileges.php
+++ b/src/Server/Privileges.php
@@ -22,6 +22,7 @@ use PhpMyAdmin\Html\MySQLDocumentation;
use PhpMyAdmin\Identifiers\DatabaseName;
use PhpMyAdmin\Identifiers\TableName;
use PhpMyAdmin\Message;
+use PhpMyAdmin\MessageType;
use PhpMyAdmin\Query\Compatibility;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
@@ -2606,7 +2607,7 @@ class Privileges
. 'if they have been changed manually. In this case, '
. 'you should %sreload the privileges%s before you continue.',
),
- Message::NOTICE,
+ MessageType::Notice,
);
$flushnote->addParamHtml(
'