Skip to content

Commit 14f8347

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #17332 from mauriciofauth/db-table-ctrl-props-removal
Remove `db` and `table` properties from controllers
2 parents 8cbb30b + 5a34a3b commit 14f8347

108 files changed

Lines changed: 355 additions & 935 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎libraries/classes/Common.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,6 @@ private static function setDatabaseAndTableFromRequest(
529529

530530
$urlParams['db'] = $db;
531531
$urlParams['table'] = $table;
532-
$containerBuilder->setParameter('db', $db);
533-
$containerBuilder->setParameter('table', $table);
534532
$containerBuilder->setParameter('url_params', $urlParams);
535533
}
536534

‎libraries/classes/Controllers/Database/AbstractController.php‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace PhpMyAdmin\Controllers\Database\CentralColumns;
66

7-
use PhpMyAdmin\Controllers\Database\AbstractController;
7+
use PhpMyAdmin\Controllers\AbstractController;
88
use PhpMyAdmin\Database\CentralColumns;
99
use PhpMyAdmin\ResponseRenderer;
1010
use PhpMyAdmin\Template;
@@ -17,16 +17,15 @@ final class PopulateColumnsController extends AbstractController
1717
public function __construct(
1818
ResponseRenderer $response,
1919
Template $template,
20-
string $db,
2120
CentralColumns $centralColumns
2221
) {
23-
parent::__construct($response, $template, $db);
22+
parent::__construct($response, $template);
2423
$this->centralColumns = $centralColumns;
2524
}
2625

2726
public function __invoke(): void
2827
{
29-
$columns = $this->centralColumns->getColumnsNotInCentralList($this->db, $_POST['selectedTable']);
28+
$columns = $this->centralColumns->getColumnsNotInCentralList($GLOBALS['db'], $_POST['selectedTable']);
3029
$this->render('database/central_columns/populate_columns', ['columns' => $columns]);
3130
}
3231
}

‎libraries/classes/Controllers/Database/CentralColumnsController.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace PhpMyAdmin\Controllers\Database;
99

10+
use PhpMyAdmin\Controllers\AbstractController;
1011
use PhpMyAdmin\Database\CentralColumns;
1112
use PhpMyAdmin\Message;
1213
use PhpMyAdmin\ResponseRenderer;
@@ -26,10 +27,9 @@ class CentralColumnsController extends AbstractController
2627
public function __construct(
2728
ResponseRenderer $response,
2829
Template $template,
29-
string $db,
3030
CentralColumns $centralColumns
3131
) {
32-
parent::__construct($response, $template, $db);
32+
parent::__construct($response, $template);
3333
$this->centralColumns = $centralColumns;
3434
}
3535

@@ -156,15 +156,15 @@ public function main(array $params): void
156156
if (! empty($params['total_rows']) && is_numeric($params['total_rows'])) {
157157
$totalRows = (int) $params['total_rows'];
158158
} else {
159-
$totalRows = $this->centralColumns->getCount($this->db);
159+
$totalRows = $this->centralColumns->getCount($GLOBALS['db']);
160160
}
161161

162162
$pos = 0;
163163
if (isset($params['pos']) && is_numeric($params['pos'])) {
164164
$pos = (int) $params['pos'];
165165
}
166166

167-
$variables = $this->centralColumns->getTemplateVariablesForMain($this->db, $totalRows, $pos, $text_dir);
167+
$variables = $this->centralColumns->getTemplateVariablesForMain($GLOBALS['db'], $totalRows, $pos, $text_dir);
168168

169169
$this->render('database/central_columns/main', $variables);
170170
}
@@ -176,7 +176,7 @@ public function main(array $params): void
176176
*/
177177
public function getColumnList(array $params): array
178178
{
179-
return $this->centralColumns->getListRaw($this->db, $params['cur_table'] ?? '');
179+
return $this->centralColumns->getListRaw($GLOBALS['db'], $params['cur_table'] ?? '');
180180
}
181181

182182
/**
@@ -192,7 +192,7 @@ public function editSave(array $params)
192192
}
193193

194194
return $this->centralColumns->updateOneColumn(
195-
$this->db,
195+
$GLOBALS['db'],
196196
$params['orig_col_name'],
197197
$params['col_name'],
198198
$params['col_type'],
@@ -218,7 +218,7 @@ public function addNewColumn(array $params)
218218
}
219219

220220
return $this->centralColumns->updateOneColumn(
221-
$this->db,
221+
$GLOBALS['db'],
222222
'',
223223
$params['col_name'],
224224
$params['col_type'],

‎libraries/classes/Controllers/Database/DataDictionaryController.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpMyAdmin\Controllers\Database;
66

77
use PhpMyAdmin\ConfigStorage\Relation;
8+
use PhpMyAdmin\Controllers\AbstractController;
89
use PhpMyAdmin\DatabaseInterface;
910
use PhpMyAdmin\Index;
1011
use PhpMyAdmin\ResponseRenderer;
@@ -29,12 +30,11 @@ class DataDictionaryController extends AbstractController
2930
public function __construct(
3031
ResponseRenderer $response,
3132
Template $template,
32-
string $db,
3333
Relation $relation,
3434
Transformations $transformations,
3535
DatabaseInterface $dbi
3636
) {
37-
parent::__construct($response, $template, $db);
37+
parent::__construct($response, $template);
3838
$this->relation = $relation;
3939
$this->transformations = $transformations;
4040
$this->dbi = $dbi;
@@ -46,28 +46,28 @@ public function __invoke(): void
4646

4747
$relationParameters = $this->relation->getRelationParameters();
4848

49-
$comment = $this->relation->getDbComment($this->db);
49+
$comment = $this->relation->getDbComment($GLOBALS['db']);
5050

51-
$this->dbi->selectDb($this->db);
52-
$tablesNames = $this->dbi->getTables($this->db);
51+
$this->dbi->selectDb($GLOBALS['db']);
52+
$tablesNames = $this->dbi->getTables($GLOBALS['db']);
5353

5454
$tables = [];
5555
foreach ($tablesNames as $tableName) {
56-
$showComment = (string) $this->dbi->getTable($this->db, $tableName)->getStatusInfo('TABLE_COMMENT');
56+
$showComment = (string) $this->dbi->getTable($GLOBALS['db'], $tableName)->getStatusInfo('TABLE_COMMENT');
5757

5858
[, $primaryKeys] = Util::processIndexData(
59-
$this->dbi->getTableIndexes($this->db, $tableName)
59+
$this->dbi->getTableIndexes($GLOBALS['db'], $tableName)
6060
);
6161

6262
[$foreigners, $hasRelation] = $this->relation->getRelationsAndStatus(
6363
$relationParameters->relationFeature !== null,
64-
$this->db,
64+
$GLOBALS['db'],
6565
$tableName
6666
);
6767

68-
$columnsComments = $this->relation->getComments($this->db, $tableName);
68+
$columnsComments = $this->relation->getComments($GLOBALS['db'], $tableName);
6969

70-
$columns = $this->dbi->getColumns($this->db, $tableName);
70+
$columns = $this->dbi->getColumns($GLOBALS['db'], $tableName);
7171
$rows = [];
7272
foreach ($columns as $row) {
7373
$extractedColumnSpec = Util::extractColumnSpec($row['Type']);
@@ -84,7 +84,7 @@ public function __invoke(): void
8484

8585
$mime = '';
8686
if ($relationParameters->browserTransformationFeature !== null) {
87-
$mimeMap = $this->transformations->getMime($this->db, $tableName, true);
87+
$mimeMap = $this->transformations->getMime($GLOBALS['db'], $tableName, true);
8888
if (is_array($mimeMap) && isset($mimeMap[$row['Field']]['mimetype'])) {
8989
$mime = str_replace('_', '/', $mimeMap[$row['Field']]['mimetype']);
9090
}
@@ -109,12 +109,12 @@ public function __invoke(): void
109109
'has_relation' => $hasRelation,
110110
'has_mime' => $relationParameters->browserTransformationFeature !== null,
111111
'columns' => $rows,
112-
'indexes' => Index::getFromTable($tableName, $this->db),
112+
'indexes' => Index::getFromTable($tableName, $GLOBALS['db']),
113113
];
114114
}
115115

116116
$this->render('database/data_dictionary/index', [
117-
'database' => $this->db,
117+
'database' => $GLOBALS['db'],
118118
'comment' => $comment,
119119
'tables' => $tables,
120120
]);

‎libraries/classes/Controllers/Database/DesignerController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace PhpMyAdmin\Controllers\Database;
66

7+
use PhpMyAdmin\Controllers\AbstractController;
78
use PhpMyAdmin\Database\Designer;
89
use PhpMyAdmin\Database\Designer\Common as DesignerCommon;
910
use PhpMyAdmin\ResponseRenderer;
@@ -27,11 +28,10 @@ class DesignerController extends AbstractController
2728
public function __construct(
2829
ResponseRenderer $response,
2930
Template $template,
30-
string $db,
3131
Designer $databaseDesigner,
3232
DesignerCommon $designerCommon
3333
) {
34-
parent::__construct($response, $template, $db);
34+
parent::__construct($response, $template);
3535
$this->databaseDesigner = $databaseDesigner;
3636
$this->designerCommon = $designerCommon;
3737
}

‎libraries/classes/Controllers/Database/EventsController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace PhpMyAdmin\Controllers\Database;
66

7+
use PhpMyAdmin\Controllers\AbstractController;
78
use PhpMyAdmin\Database\Events;
89
use PhpMyAdmin\DatabaseInterface;
910
use PhpMyAdmin\ResponseRenderer;
@@ -24,11 +25,10 @@ final class EventsController extends AbstractController
2425
public function __construct(
2526
ResponseRenderer $response,
2627
Template $template,
27-
string $db,
2828
Events $events,
2929
DatabaseInterface $dbi
3030
) {
31-
parent::__construct($response, $template, $db);
31+
parent::__construct($response, $template);
3232
$this->events = $events;
3333
$this->dbi = $dbi;
3434
}

‎libraries/classes/Controllers/Database/ExportController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpMyAdmin\Controllers\Database;
66

77
use PhpMyAdmin\Config\PageSettings;
8+
use PhpMyAdmin\Controllers\AbstractController;
89
use PhpMyAdmin\Export;
910
use PhpMyAdmin\Export\Options;
1011
use PhpMyAdmin\Message;
@@ -29,11 +30,10 @@ final class ExportController extends AbstractController
2930
public function __construct(
3031
ResponseRenderer $response,
3132
Template $template,
32-
string $db,
3333
Export $export,
3434
Options $exportOptions
3535
) {
36-
parent::__construct($response, $template, $db);
36+
parent::__construct($response, $template);
3737
$this->export = $export;
3838
$this->exportOptions = $exportOptions;
3939
}

‎libraries/classes/Controllers/Database/ImportController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use PhpMyAdmin\Charsets;
88
use PhpMyAdmin\Config\PageSettings;
9+
use PhpMyAdmin\Controllers\AbstractController;
910
use PhpMyAdmin\DatabaseInterface;
1011
use PhpMyAdmin\Encoding;
1112
use PhpMyAdmin\Import;
@@ -27,9 +28,9 @@ final class ImportController extends AbstractController
2728
/** @var DatabaseInterface */
2829
private $dbi;
2930

30-
public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi)
31+
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
3132
{
32-
parent::__construct($response, $template, $db);
33+
parent::__construct($response, $template);
3334
$this->dbi = $dbi;
3435
}
3536

‎libraries/classes/Controllers/Database/MultiTableQueryController.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace PhpMyAdmin\Controllers\Database;
66

7+
use PhpMyAdmin\Controllers\AbstractController;
78
use PhpMyAdmin\Database\MultiTableQuery;
89
use PhpMyAdmin\DatabaseInterface;
910
use PhpMyAdmin\ResponseRenderer;
@@ -17,9 +18,9 @@ class MultiTableQueryController extends AbstractController
1718
/** @var DatabaseInterface */
1819
private $dbi;
1920

20-
public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi)
21+
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
2122
{
22-
parent::__construct($response, $template, $db);
23+
parent::__construct($response, $template);
2324
$this->dbi = $dbi;
2425
}
2526

@@ -30,7 +31,7 @@ public function __invoke(): void
3031
'database/query_generator.js',
3132
]);
3233

33-
$queryInstance = new MultiTableQuery($this->dbi, $this->template, $this->db);
34+
$queryInstance = new MultiTableQuery($this->dbi, $this->template, $GLOBALS['db']);
3435

3536
$this->response->addHTML($queryInstance->getFormHtml());
3637
}

0 commit comments

Comments
 (0)