Skip to content

Commit 797fe78

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19160 from kamil-tekiela/MessageType
Create MessageType enum
2 parents 510e442 + a381829 commit 797fe78

37 files changed

Lines changed: 163 additions & 160 deletions

‎src/Controllers/HomeController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use PhpMyAdmin\Identifiers\TableName;
2323
use PhpMyAdmin\LanguageManager;
2424
use PhpMyAdmin\Message;
25+
use PhpMyAdmin\MessageType;
2526
use PhpMyAdmin\ResponseRenderer;
2627
use PhpMyAdmin\Server\Select;
2728
use PhpMyAdmin\Theme\ThemeManager;
@@ -210,7 +211,7 @@ public function __invoke(ServerRequest $request): Response|null
210211
$messageInstance->addParamHtml('</a>');
211212
/* Show error if user has configured something, notice elsewhere */
212213
if (! empty($config->settings['Servers'][Current::$server]['pmadb'])) {
213-
$messageInstance->setType(Message::ERROR);
214+
$messageInstance->setType(MessageType::Error);
214215
}
215216

216217
$configStorageMessage = $messageInstance->getDisplay();

‎src/Controllers/Import/ImportController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use PhpMyAdmin\Import\Import;
2121
use PhpMyAdmin\Import\ImportSettings;
2222
use PhpMyAdmin\Message;
23+
use PhpMyAdmin\MessageType;
2324
use PhpMyAdmin\ParseAnalyze;
2425
use PhpMyAdmin\Plugins\Import\ImportFormat;
2526
use PhpMyAdmin\ResponseRenderer;
@@ -705,7 +706,7 @@ public function __invoke(ServerRequest $request): Response|null
705706
$this->response->addJSON('message', Message::success(ImportSettings::$message));
706707
$this->response->addJSON(
707708
'sql_query',
708-
Generator::getMessage(ImportSettings::$message, $GLOBALS['sql_query'], 'success'),
709+
Generator::getMessage(ImportSettings::$message, $GLOBALS['sql_query'], MessageType::Success),
709710
);
710711
} elseif ($GLOBALS['result'] === false) {
711712
$this->response->setRequestStatus(false);

‎src/Controllers/Operations/DatabaseController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use PhpMyAdmin\Identifiers\DatabaseName;
1919
use PhpMyAdmin\Identifiers\InvalidDatabaseName;
2020
use PhpMyAdmin\Message;
21+
use PhpMyAdmin\MessageType;
2122
use PhpMyAdmin\Operations;
2223
use PhpMyAdmin\Plugins;
2324
use PhpMyAdmin\Query\Utilities;
@@ -289,7 +290,7 @@ public function __invoke(ServerRequest $request): Response|null
289290
$GLOBALS['message']->addParamHtml('</a>');
290291
/* Show error if user has configured something, notice elsewhere */
291292
if (! empty($config->settings['Servers'][Current::$server]['pmadb'])) {
292-
$GLOBALS['message']->setType(Message::ERROR);
293+
$GLOBALS['message']->setType(MessageType::Error);
293294
}
294295
}
295296

‎src/Controllers/Operations/TableController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use PhpMyAdmin\Identifiers\TableName;
1919
use PhpMyAdmin\Index;
2020
use PhpMyAdmin\Message;
21+
use PhpMyAdmin\MessageType;
2122
use PhpMyAdmin\Operations;
2223
use PhpMyAdmin\Partitioning\Partition;
2324
use PhpMyAdmin\Query\Generator as QueryGenerator;
@@ -371,7 +372,7 @@ public function __invoke(ServerRequest $request): Response|null
371372
if ($warningMessages !== []) {
372373
$newMessage = new Message();
373374
$newMessage->addMessagesString($warningMessages);
374-
$newMessage->setType(Message::ERROR);
375+
$newMessage->setType(MessageType::Error);
375376
if ($request->isAjax()) {
376377
$this->response->setRequestStatus(false);
377378
$this->response->addJSON('message', $newMessage);

‎src/Controllers/Operations/ViewController.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use PhpMyAdmin\Identifiers\DatabaseName;
1616
use PhpMyAdmin\Identifiers\TableName;
1717
use PhpMyAdmin\Message;
18+
use PhpMyAdmin\MessageType;
1819
use PhpMyAdmin\ResponseRenderer;
1920
use PhpMyAdmin\Url;
2021
use PhpMyAdmin\Util;
@@ -86,7 +87,7 @@ public function __invoke(ServerRequest $request): Response|null
8687
$GLOBALS['urlParams']['goto'] = $GLOBALS['urlParams']['back'] = Url::getFromRoute('/view/operations');
8788

8889
$message = new Message();
89-
$type = 'success';
90+
$type = MessageType::Success;
9091
$newname = $request->getParsedBodyParam('new_name');
9192

9293
$warningMessages = [];
@@ -118,12 +119,12 @@ public function __invoke(ServerRequest $request): Response|null
118119
$message->addText(__('Error'));
119120
}
120121

121-
$type = $result ? 'success' : 'error';
122+
$type = $result ? MessageType::Success : MessageType::Error;
122123
}
123124

124125
if ($warningMessages !== []) {
125126
$message->addMessagesString($warningMessages);
126-
$message->setType(Message::ERROR);
127+
$message->setType(MessageType::Error);
127128
}
128129

129130
$this->response->addHTML(Generator::getMessage(

‎src/Controllers/Server/Databases/CreateController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use PhpMyAdmin\Http\Response;
1414
use PhpMyAdmin\Http\ServerRequest;
1515
use PhpMyAdmin\Message;
16+
use PhpMyAdmin\MessageType;
1617
use PhpMyAdmin\ResponseRenderer;
1718
use PhpMyAdmin\Url;
1819
use PhpMyAdmin\Util;
@@ -85,7 +86,7 @@ public function __invoke(ServerRequest $request): Response|null
8586

8687
$json = [
8788
'message' => $message,
88-
'sql_query' => Generator::getMessage('', $sqlQuery, 'success'),
89+
'sql_query' => Generator::getMessage('', $sqlQuery, MessageType::Success),
8990
'url' => $scriptName . Url::getCommon(
9091
['db' => $newDb],
9192
! str_contains($scriptName, '?') ? '?' : '&',

‎src/Controllers/Table/AddFieldController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use PhpMyAdmin\Identifiers\DatabaseName;
1818
use PhpMyAdmin\Identifiers\TableName;
1919
use PhpMyAdmin\Message;
20+
use PhpMyAdmin\MessageType;
2021
use PhpMyAdmin\ResponseRenderer;
2122
use PhpMyAdmin\Table\ColumnsDefinition;
2223
use PhpMyAdmin\Transformations;
@@ -136,7 +137,7 @@ public function __invoke(ServerRequest $request): Response|null
136137
$GLOBALS['message']->addParam(Current::$table);
137138
$this->response->addJSON(
138139
'message',
139-
Generator::getMessage($GLOBALS['message'], $GLOBALS['sql_query'], 'success'),
140+
Generator::getMessage($GLOBALS['message'], $GLOBALS['sql_query'], MessageType::Success),
140141
);
141142

142143
// Give an URL to call and use to appends the structure after the success message

‎src/Controllers/Table/FindReplaceController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use PhpMyAdmin\Identifiers\DatabaseName;
1616
use PhpMyAdmin\Identifiers\TableName;
1717
use PhpMyAdmin\Message;
18+
use PhpMyAdmin\MessageType;
1819
use PhpMyAdmin\ResponseRenderer;
1920
use PhpMyAdmin\Template;
2021
use PhpMyAdmin\Url;
@@ -118,7 +119,7 @@ public function __invoke(ServerRequest $request): Response|null
118119
Generator::getMessage(
119120
__('Your SQL query has been executed successfully.'),
120121
null,
121-
'success',
122+
MessageType::Success,
122123
),
123124
);
124125
}

‎src/Controllers/Table/IndexRenameController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use PhpMyAdmin\Identifiers\TableName;
1717
use PhpMyAdmin\Index;
1818
use PhpMyAdmin\Message;
19+
use PhpMyAdmin\MessageType;
1920
use PhpMyAdmin\ResponseRenderer;
2021
use PhpMyAdmin\Table\Indexes;
2122
use PhpMyAdmin\Template;
@@ -131,7 +132,7 @@ public function __invoke(ServerRequest $request): Response|null
131132
$message->addParam($tableName->getName());
132133
$this->response->addJSON(
133134
'message',
134-
Generator::getMessage($message, $sqlQuery, 'success'),
135+
Generator::getMessage($message, $sqlQuery, MessageType::Success),
135136
);
136137

137138
$indexes = Index::getFromTable($this->dbi, $tableName->getName(), $databaseName->getName());

‎src/Controllers/Table/IndexesController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use PhpMyAdmin\Identifiers\TableName;
1818
use PhpMyAdmin\Index;
1919
use PhpMyAdmin\Message;
20+
use PhpMyAdmin\MessageType;
2021
use PhpMyAdmin\ResponseRenderer;
2122
use PhpMyAdmin\Table\Indexes;
2223
use PhpMyAdmin\Template;
@@ -143,7 +144,7 @@ public function __invoke(ServerRequest $request): Response|null
143144
$message->addParam(Current::$table);
144145
$this->response->addJSON(
145146
'message',
146-
Generator::getMessage($message, $sqlQuery, 'success'),
147+
Generator::getMessage($message, $sqlQuery, MessageType::Success),
147148
);
148149

149150
$indexes = Index::getFromTable($this->dbi, Current::$table, Current::$database);

0 commit comments

Comments
 (0)