gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline $isProcOrFunc variable in Routines::handleRequestCreateOrEdit

Browse Source 
Improves type inference of item_original_type POST param

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2022-09-11 14:55:11 -03:00
parent b79b9e37a0
commit 329eb3511c
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/classes/Database/Routines.php
View File

@ -196,26 +196,18 @@ class Routines
if (! count($errors)) {
// Execute the created query
if (! empty($_POST['editor_process_edit'])) {
$isProcOrFunc = in_array(
$_POST['item_original_type'],
[
'PROCEDURE',
'FUNCTION',
]
);
if (! $isProcOrFunc) {
if (! in_array($_POST['item_original_type'], ['PROCEDURE', 'FUNCTION'], true)) {
$errors[] = sprintf(
__('Invalid routine type: "%s"'),
htmlspecialchars($_POST['item_original_type'])
);
} else {
// Backup the old routine, in case something goes wrong
$create_routine = $this->dbi->getDefinition(
$db,
$_POST['item_original_type'],
$_POST['item_original_name']
);
if ($_POST['item_original_type'] === 'FUNCTION') {
$create_routine = $this->dbi->getDefinition($db, 'FUNCTION', $_POST['item_original_name']);
} else {
$create_routine = $this->dbi->getDefinition($db, 'PROCEDURE', $_POST['item_original_name']);
}
$privilegesBackup = $this->backupPrivileges();

5
psalm-baseline.xml
View File

@ -5195,7 +5195,7 @@
<code>$_POST['item_name']</code>
<code>$_POST['item_original_name']</code>
<code>$_POST['item_original_name']</code>
<code>$_POST['item_original_type']</code>
<code>$_POST['item_original_name']</code>
<code>$_POST['item_original_type']</code>
<code>$_POST['item_returnopts_num']</code>
<code>$_POST['item_returnopts_text']</code>
@ -5389,12 +5389,11 @@
<code>$value</code>
<code>$value</code>
</MixedAssignment>
<MixedOperand occurrences="28">
<MixedOperand occurrences="27">
<code>$_POST['funcs'][$routine['item_param_name'][$i]]</code>
<code>$_POST['item_name']</code>
<code>$_POST['item_original_name']</code>
<code>$_POST['item_original_type']</code>
<code>$_POST['item_original_type']</code>
<code>$_POST['item_returnlength']</code>
<code>$_POST['item_type']</code>
<code>$itemDefinition</code>