diff options
| -rw-r--r-- | libraries/classes/Controllers/Table/RecentFavoriteController.php | 8 | ||||
| -rw-r--r-- | psalm-baseline.xml | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libraries/classes/Controllers/Table/RecentFavoriteController.php b/libraries/classes/Controllers/Table/RecentFavoriteController.php index 3cb915b618..61f97bf810 100644 --- a/libraries/classes/Controllers/Table/RecentFavoriteController.php +++ b/libraries/classes/Controllers/Table/RecentFavoriteController.php @@ -8,6 +8,8 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Sql\SqlController; use PhpMyAdmin\RecentFavoriteTable; +use function is_string; + /** * Browse recent and favorite tables chosen from navigation. */ @@ -17,9 +19,11 @@ class RecentFavoriteController extends AbstractController { $GLOBALS['containerBuilder'] = $GLOBALS['containerBuilder'] ?? null; - RecentFavoriteTable::getInstance('recent')->removeIfInvalid($_REQUEST['db'], $_REQUEST['table']); + $db = isset($_REQUEST['db']) && is_string($_REQUEST['db']) ? $_REQUEST['db'] : ''; + $table = isset($_REQUEST['table']) && is_string($_REQUEST['table']) ? $_REQUEST['table'] : ''; - RecentFavoriteTable::getInstance('favorite')->removeIfInvalid($_REQUEST['db'], $_REQUEST['table']); + RecentFavoriteTable::getInstance('recent')->removeIfInvalid($db, $table); + RecentFavoriteTable::getInstance('favorite')->removeIfInvalid($db, $table); /** @var SqlController $controller */ $controller = $GLOBALS['containerBuilder']->get(SqlController::class); diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 19d34b1304..3528e6a840 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -3556,12 +3556,6 @@ </MixedArgument> </file> <file src="libraries/classes/Controllers/Table/RecentFavoriteController.php"> - <MixedArgument occurrences="4"> - <code>$_REQUEST['db']</code> - <code>$_REQUEST['db']</code> - <code>$_REQUEST['table']</code> - <code>$_REQUEST['table']</code> - </MixedArgument> <PossiblyNullReference occurrences="1"> <code>get</code> </PossiblyNullReference> |