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

Implement getErrorCount() in Triggers

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-12-16 00:14:47 +00:00
parent 19b51a146c
commit ea4d8e4034
5 changed files with 24 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
phpstan-baseline.neon
View File

@ -5769,12 +5769,6 @@ parameters:
count: 11
path: src/Controllers/Triggers/IndexController.php
-
message: '#^Only booleans are allowed in \|\|, int\<0, max\> given on the left side\.$#'
identifier: booleanOr.leftNotBoolean
count: 1
path: src/Controllers/Triggers/IndexController.php
-
message: '#^Parameter \#1 \$identifier of static method PhpMyAdmin\\Util\:\:backquote\(\) expects string\|Stringable\|null, mixed given\.$#'
identifier: argument.type
@ -5793,12 +5787,6 @@ parameters:
count: 1
path: src/Controllers/Triggers/IndexController.php
-
message: '#^Parameter \#1 \$value of function count expects array\|Countable, mixed given\.$#'
identifier: argument.type
count: 1
path: src/Controllers/Triggers/IndexController.php
-
message: '#^Parameter \#3 \$name of method PhpMyAdmin\\Triggers\\Triggers\:\:getTriggerByName\(\) expects string, mixed given\.$#'
identifier: argument.type
@ -18099,18 +18087,6 @@ parameters:
count: 1
path: src/Transformations.php
-
message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#'
identifier: foreach.nonIterable
count: 1
path: src/Triggers/Triggers.php
-
message: '#^Binary operation "\." between ''\<li\>'' and mixed results in an error\.$#'
identifier: binaryOp.invalid
count: 1
path: src/Triggers/Triggers.php
-
message: '#^Binary operation "\.\=" between non\-falsy\-string and mixed results in an error\.$#'
identifier: assignOp.invalid
@ -18126,12 +18102,6 @@ parameters:
count: 1
path: src/Triggers/Triggers.php
-
message: '#^Cannot access an offset on mixed\.$#'
identifier: offsetAccess.nonOffsetAccessible
count: 7
path: src/Triggers/Triggers.php
-
message: '#^Cannot call method getCreateSql\(\) on PhpMyAdmin\\Triggers\\Trigger\|null\.$#'
identifier: method.nonObject

39
psalm-baseline.xml
View File

@ -3647,9 +3647,6 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Triggers/IndexController.php">
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errors']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
@ -3659,9 +3656,6 @@
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errors']]]></code>
</MixedAssignment>
<PossiblyInvalidArgument>
<code><![CDATA[$_POST['item_name']]]></code>
<code><![CDATA[$_POST['item_name']]]></code>
@ -3698,10 +3692,6 @@
<code><![CDATA[empty($_REQUEST['edit_item'])]]></code>
<code><![CDATA[empty($_REQUEST['item_name'])]]></code>
</RiskyTruthyFalsyComparison>
<TypeDoesNotContainType>
<code><![CDATA[count($GLOBALS['errors'])]]></code>
<code><![CDATA[count($GLOBALS['errors'])]]></code>
</TypeDoesNotContainType>
</file>
<file src="src/Controllers/UserPasswordController.php">
<DeprecatedMethod>
@ -10565,29 +10555,6 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errors']]]></code>
<code><![CDATA[$GLOBALS['errors']]]></code>
</InvalidArrayOffset>
<MixedArrayAssignment>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
<code><![CDATA[$GLOBALS['errors'][]]]></code>
</MixedArrayAssignment>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errors']]]></code>
<code><![CDATA[$string]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[$string]]></code>
</MixedOperand>
<PossiblyInvalidArgument>
<code><![CDATA[$_POST['item_definer']]]></code>
<code><![CDATA[$_POST['item_name']]]></code>
@ -10601,15 +10568,9 @@
<PossiblyInvalidOperand>
<code><![CDATA[$_POST['item_definition']]]></code>
</PossiblyInvalidOperand>
<PossiblyNullIterator>
<code><![CDATA[$GLOBALS['errors']]]></code>
</PossiblyNullIterator>
<PossiblyNullReference>
<code><![CDATA[getCreateSql]]></code>
</PossiblyNullReference>
<PossiblyUndefinedArrayOffset>
<code><![CDATA[$GLOBALS['errors']]]></code>
</PossiblyUndefinedArrayOffset>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($_POST['editor_process_edit'])]]></code>
<code><![CDATA[empty($_POST['item_definer'])]]></code>

10
src/Controllers/Triggers/IndexController.php
View File

@ -22,7 +22,6 @@ use PhpMyAdmin\UrlParams;
use PhpMyAdmin\Util;
use function __;
use function count;
use function htmlspecialchars;
use function in_array;
use function mb_strtoupper;
@ -45,8 +44,6 @@ final class IndexController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errors'] ??= null;
$this->response->addScriptFiles(['triggers.js', 'sql.js']);
if (! $request->isAjax()) {
@ -93,11 +90,6 @@ final class IndexController implements InvocableController
$this->dbi->selectDb(Current::$database);
}
/**
* Keep a list of errors that occurred while
* processing an 'Add' or 'Edit' operation.
*/
$GLOBALS['errors'] = [];
$GLOBALS['message'] ??= null;
if (! empty($_POST['editor_process_add']) || ! empty($_POST['editor_process_edit'])) {
@ -160,7 +152,7 @@ final class IndexController implements InvocableController
* Display a form used to add/edit a trigger, if necessary
*/
if (
count($GLOBALS['errors'])
$this->triggers->getErrorCount() > 0
|| empty($_POST['editor_process_add'])
&& empty($_POST['editor_process_edit'])
&& (! empty($_REQUEST['add_item']) || ! empty($_REQUEST['edit_item'])) // FIXME: must be simpler than that

37
src/Triggers/Triggers.php
View File

@ -16,6 +16,7 @@ use Webmozart\Assert\Assert;
use function __;
use function array_column;
use function array_multisort;
use function count;
use function explode;
use function htmlspecialchars;
use function in_array;
@ -34,6 +35,9 @@ class Triggers
private const EVENTS = ['INSERT', 'UPDATE', 'DELETE'];
/** @var list<string> */
private array $errors = [];
public function __construct(private DatabaseInterface $dbi)
{
}
@ -69,7 +73,7 @@ class Triggers
$itemQuery = $this->getQueryFromRequest();
// set by getQueryFromRequest()
if ($GLOBALS['errors'] === []) {
if ($this->errors === []) {
// Execute the created query
if (! empty($_POST['editor_process_edit'])) {
// Backup the old trigger, in case something goes wrong
@ -78,7 +82,7 @@ class Triggers
$dropItem = $trigger->getDropSql();
$result = $this->dbi->tryQuery($dropItem);
if (! $result) {
$GLOBALS['errors'][] = sprintf(
$this->errors[] = sprintf(
__('The following query has failed: "%s"'),
htmlspecialchars($dropItem),
)
@ -87,7 +91,7 @@ class Triggers
} else {
$result = $this->dbi->tryQuery($itemQuery);
if (! $result) {
$GLOBALS['errors'][] = sprintf(
$this->errors[] = sprintf(
__('The following query has failed: "%s"'),
htmlspecialchars($itemQuery),
)
@ -103,7 +107,7 @@ class Triggers
// and now even the backup query does not execute!
// This should not happen, but we better handle
// this just in case.
$GLOBALS['errors'][] = __('Sorry, we failed to restore the dropped trigger.') . '<br>'
$this->errors[] = __('Sorry, we failed to restore the dropped trigger.') . '<br>'
. __('The backed up query was:')
. '"' . htmlspecialchars($createItem) . '"<br>'
. __('MySQL said: ') . $this->dbi->getError();
@ -122,7 +126,7 @@ class Triggers
// 'Add a new item' mode
$result = $this->dbi->tryQuery($itemQuery);
if (! $result) {
$GLOBALS['errors'][] = sprintf(
$this->errors[] = sprintf(
__('The following query has failed: "%s"'),
htmlspecialchars($itemQuery),
)
@ -140,7 +144,7 @@ class Triggers
}
}
if ($GLOBALS['errors'] !== []) {
if ($this->errors !== []) {
$GLOBALS['message'] = Message::error(
'<b>'
. __(
@ -149,7 +153,7 @@ class Triggers
. '</b>',
);
$GLOBALS['message']->addHtml('<ul>');
foreach ($GLOBALS['errors'] as $string) {
foreach ($this->errors as $string) {
$GLOBALS['message']->addHtml('<li>' . $string . '</li>');
}
@ -179,8 +183,6 @@ class Triggers
*/
public function getQueryFromRequest(): string
{
$GLOBALS['errors'] ??= null;
$query = 'CREATE ';
if (! empty($_POST['item_definer'])) {
if (str_contains($_POST['item_definer'], '@')) {
@ -188,7 +190,7 @@ class Triggers
$query .= 'DEFINER=' . Util::backquote($arr[0]);
$query .= '@' . Util::backquote($arr[1]) . ' ';
} else {
$GLOBALS['errors'][] = __('The definer must be in the "username@hostname" format!');
$this->errors[] = __('The definer must be in the "username@hostname" format!');
}
}
@ -196,19 +198,19 @@ class Triggers
if (! empty($_POST['item_name'])) {
$query .= Util::backquote($_POST['item_name']) . ' ';
} else {
$GLOBALS['errors'][] = __('You must provide a trigger name!');
$this->errors[] = __('You must provide a trigger name!');
}
if (! empty($_POST['item_timing']) && in_array($_POST['item_timing'], $this->time, true)) {
$query .= $_POST['item_timing'] . ' ';
} else {
$GLOBALS['errors'][] = __('You must provide a valid timing for the trigger!');
$this->errors[] = __('You must provide a valid timing for the trigger!');
}
if (! empty($_POST['item_event']) && in_array($_POST['item_event'], self::EVENTS, true)) {
$query .= $_POST['item_event'] . ' ';
} else {
$GLOBALS['errors'][] = __('You must provide a valid event for the trigger!');
$this->errors[] = __('You must provide a valid event for the trigger!');
}
$query .= 'ON ';
@ -218,14 +220,14 @@ class Triggers
) {
$query .= Util::backquote($_POST['item_table']);
} else {
$GLOBALS['errors'][] = __('You must provide a valid table name!');
$this->errors[] = __('You must provide a valid table name!');
}
$query .= ' FOR EACH ROW ';
if (! empty($_POST['item_definition'])) {
$query .= $_POST['item_definition'];
} else {
$GLOBALS['errors'][] = __('You must provide a trigger definition.');
$this->errors[] = __('You must provide a trigger definition.');
}
return $query;
@ -274,4 +276,9 @@ class Triggers
return $tables;
}
public function getErrorCount(): int
{
return count($this->errors);
}
}

4
tests/unit/Triggers/TriggersTest.php
View File

@ -61,8 +61,6 @@ class TriggersTest extends AbstractTestCase
string $query,
int $numErr,
): void {
$GLOBALS['errors'] = [];
$_POST['item_definer'] = $definer;
$_POST['item_name'] = $name;
$_POST['item_timing'] = $timing;
@ -71,7 +69,7 @@ class TriggersTest extends AbstractTestCase
$_POST['item_definition'] = $definition;
self::assertSame($query, $this->triggers->getQueryFromRequest());
self::assertCount($numErr, $GLOBALS['errors']);
self::assertSame($numErr, $this->triggers->getErrorCount());
}
/**