Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1008,9 +1008,6 @@
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedArgument>
<PossiblyInvalidCast>
<code><![CDATA[$parameters['table']]]></code>
</PossiblyInvalidCast>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
Expand Down
11 changes: 7 additions & 4 deletions src/Controllers/Database/ImportController.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use PhpMyAdmin\Routing\Route;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;
use Webmozart\Assert\Assert;

use function __;
use function is_numeric;
Expand Down Expand Up @@ -80,12 +81,14 @@ public function __invoke(ServerRequest $request): Response
}

$offset = null;
if (isset($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) {
$offset = (int) $_REQUEST['offset'];
if ($request->has('offset') && is_numeric($request->getParam('offset'))) {
$offset = (int) $request->getParam('offset');
}

$timeoutPassed = $_REQUEST['timeout_passed'] ?? null;
$localImportFile = $_REQUEST['local_import_file'] ?? null;
$timeoutPassed = $request->getParam('timeout_passed');
Assert::nullOrString($timeoutPassed);
$localImportFile = $request->getParam('local_import_file');
Assert::nullOrString($localImportFile);
$compressions = Import::getCompressions($this->config);

$charsets = Charsets::getCharsets($this->dbi, $this->config->selectedServer['DisableIS']);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ public function __invoke(ServerRequest $request): Response
$favoriteTable = new RecentFavoriteTable($databaseName, TableName::from($favoriteTableName));
$alreadyFavorite = $favoriteInstance->contains($favoriteTable);

if (isset($_REQUEST['remove_favorite'])) {
if ($request->has('remove_favorite')) {
if ($alreadyFavorite) {
// If already in favorite list, remove it.
$favoriteInstance->remove($favoriteTable);
$alreadyFavorite = false; // for favorite_anchor template
}
} elseif (isset($_REQUEST['add_favorite'])) {
} elseif ($request->has('add_favorite')) {
if (! $alreadyFavorite) {
$numTables = count($favoriteInstance->getTables());
if ($numTables === $this->config->settings['NumFavoriteTables']) {
Expand Down
4 changes: 2 additions & 2 deletions src/Controllers/Database/Structure/RealRowCountController.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public function __construct(
public function __invoke(ServerRequest $request): Response
{
$parameters = [
'real_row_count_all' => $_REQUEST['real_row_count_all'] ?? null,
'table' => $_REQUEST['table'] ?? null,
'real_row_count_all' => $request->getParam('real_row_count_all'),
'table' => $request->getParam('table'),
];

if (Current::$database === '') {
Expand Down
5 changes: 4 additions & 1 deletion src/Controllers/Database/StructureController.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use Throwable;
use Webmozart\Assert\Assert;

use function __;
use function array_search;
Expand Down Expand Up @@ -140,7 +141,9 @@ private function getDatabaseInfo(ServerRequest $request): void

public function __invoke(ServerRequest $request): Response
{
$parameters = ['sort' => $_REQUEST['sort'] ?? null, 'sort_order' => $_REQUEST['sort_order'] ?? null];
$parameters = ['sort' => $request->getParam('sort'), 'sort_order' => $request->getParam('sort_order')];
Assert::nullOrString($parameters['sort']);
Assert::nullOrString($parameters['sort_order']);

if (Current::$database === '') {
return $this->response->missingParameterError('db');
Expand Down
2 changes: 1 addition & 1 deletion src/Controllers/Operations/DatabaseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function __invoke(ServerRequest $request): Response
}

if ($newDatabaseName !== null) {
if ($newDatabaseName->getName() === $_REQUEST['db']) {
if ($newDatabaseName->getName() === $request->getParam('db')) {
Current::$message = Message::error(
__('Cannot copy database to the same name. Change the name and try again.'),
);
Expand Down
11 changes: 7 additions & 4 deletions src/Controllers/Server/ImportController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
use PhpMyAdmin\Routing\Route;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;
use Webmozart\Assert\Assert;

use function __;
use function is_numeric;
Expand Down Expand Up @@ -65,12 +66,14 @@ public function __invoke(ServerRequest $request): Response
}

$offset = null;
if (isset($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) {
$offset = (int) $_REQUEST['offset'];
if ($request->has('offset') && is_numeric($request->getParam('offset'))) {
$offset = (int) $request->getParam('offset');
}

$timeoutPassed = $_REQUEST['timeout_passed'] ?? null;
$localImportFile = $_REQUEST['local_import_file'] ?? null;
$timeoutPassed = $request->getParam('timeout_passed');
Assert::nullOrString($timeoutPassed);
$localImportFile = $request->getParam('local_import_file');
Assert::nullOrString($localImportFile);
$compressions = Import::getCompressions($this->config);

$charsets = Charsets::getCharsets($this->dbi, $this->config->selectedServer['DisableIS']);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public function testRealRowCount(): void
{
Config::getInstance()->selectedServer['DisableIS'] = true;
Current::$database = 'world';
$_REQUEST['table'] = 'City';

$dbiDummy = $this->createDbiDummy();
$dbiDummy->addSelectDb('world');
Expand All @@ -31,17 +30,24 @@ public function testRealRowCount(): void

$response = new ResponseStub();

$request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/')
$requestFactory = ServerRequestFactory::create();
$request = $requestFactory->createServerRequest('GET', 'http://example.com/')
->withQueryParams(['db' => 'world', 'table' => 'City', 'ajax_request' => '1']);

(new RealRowCountController($response, $dbi, new DbTableExists($dbi)))($request);

$json = $response->getJSONResult();
self::assertSame('4,079', $json['real_row_count']);

$_REQUEST['real_row_count_all'] = 'on';
$requestAll = $requestFactory->createServerRequest('GET', 'http://example.com/')
->withQueryParams([
'db' => 'world',
'table' => 'City',
'ajax_request' => '1',
'real_row_count_all' => 'on',
]);

(new RealRowCountController($response, $dbi, new DbTableExists($dbi)))($request);
(new RealRowCountController($response, $dbi, new DbTableExists($dbi)))($requestAll);

$json = $response->getJSONResult();
$expected = [
Expand Down
Loading