Visitar URL original
Extract Config\PageSettings initialization from constructor · phpmyadmin/phpmyadmin@95ae4f7 · GitHub
Skip to content

Commit 95ae4f7

Browse files
MauricioFauthMauricioFauth
committed
Extract Config\PageSettings initialization from constructor
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 0b30584 commit 95ae4f7

23 files changed

Lines changed: 54 additions & 27 deletions

‎libraries/classes/Config/PageSettings.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,17 @@ class PageSettings
4242

4343
private UserPreferences $userPreferences;
4444

45+
public function __construct()
46+
{
47+
$this->userPreferences = new UserPreferences($GLOBALS['dbi']);
48+
}
49+
4550
/**
4651
* @param string $formGroupName The name of config form group to display
4752
* @param string|null $elemId Id of the div containing settings
4853
*/
49-
public function __construct(string $formGroupName, string|null $elemId = null)
54+
public function init(string $formGroupName, string|null $elemId = null): void
5055
{
51-
$this->userPreferences = new UserPreferences($GLOBALS['dbi']);
52-
5356
$formClass = PageFormList::get($formGroupName);
5457
if ($formClass === null) {
5558
return;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public function __invoke(ServerRequest $request): void
3939
$GLOBALS['unlim_num_rows'] ??= null;
4040
$GLOBALS['errorUrl'] ??= null;
4141

42-
$pageSettings = new PageSettings('Export');
42+
$pageSettings = new PageSettings();
43+
$pageSettings->init('Export');
4344
$pageSettingsErrorHtml = $pageSettings->getErrorHTML();
4445
$pageSettingsHtml = $pageSettings->getHTML();
4546

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public function __invoke(ServerRequest $request): void
3636
$GLOBALS['SESSION_KEY'] ??= null;
3737
$GLOBALS['errorUrl'] ??= null;
3838

39-
$pageSettings = new PageSettings('Import');
39+
$pageSettings = new PageSettings();
40+
$pageSettings->init('Import');
4041
$pageSettingsErrorHtml = $pageSettings->getErrorHTML();
4142
$pageSettingsHtml = $pageSettings->getHTML();
4243

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public function __invoke(ServerRequest $request): void
3333

3434
$this->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']);
3535

36-
$pageSettings = new PageSettings('Sql');
36+
$pageSettings = new PageSettings();
37+
$pageSettings->init('Sql');
3738
$this->response->addHTML($pageSettings->getErrorHTML());
3839
$this->response->addHTML($pageSettings->getHTML());
3940

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ public function __invoke(ServerRequest $request): void
147147
$this->replicationInfo->load($request->getParsedBodyParam('primary_connection'));
148148
$replicaInfo = $this->replicationInfo->getReplicaInfo();
149149

150-
$pageSettings = new PageSettings('DbStructure');
150+
$pageSettings = new PageSettings();
151+
$pageSettings->init('DbStructure');
151152
$this->response->addHTML($pageSettings->getErrorHTML());
152153
$this->response->addHTML($pageSettings->getHTML());
153154

‎libraries/classes/Controllers/NavigationController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public function __invoke(ServerRequest $request): void
4444
}
4545

4646
if ($request->hasBodyParam('getNaviSettings')) {
47-
$pageSettings = new PageSettings('Navi', 'pma_navigation_settings');
47+
$pageSettings = new PageSettings();
48+
$pageSettings->init('Navi', 'pma_navigation_settings');
4849
$this->response->addHTML($pageSettings->getErrorHTML());
4950
$this->response->addJSON('message', $pageSettings->getHTML());
5051

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public function __invoke(ServerRequest $request): void
4040
$this->dbi->selectDb('mysql');
4141
}
4242

43-
$pageSettings = new PageSettings('Export');
43+
$pageSettings = new PageSettings();
44+
$pageSettings->init('Export');
4445
$pageSettingsErrorHtml = $pageSettings->getErrorHTML();
4546
$pageSettingsHtml = $pageSettings->getHTML();
4647

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public function __invoke(ServerRequest $request): void
3636
$GLOBALS['SESSION_KEY'] ??= null;
3737
$GLOBALS['errorUrl'] ??= null;
3838

39-
$pageSettings = new PageSettings('Import');
39+
$pageSettings = new PageSettings();
40+
$pageSettings->init('Import');
4041
$pageSettingsErrorHtml = $pageSettings->getErrorHTML();
4142
$pageSettingsHtml = $pageSettings->getHTML();
4243

‎libraries/classes/Controllers/Server/SqlController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public function __invoke(ServerRequest $request): void
3333

3434
$this->addScriptFiles(['makegrid.js', 'vendor/jquery/jquery.uitablefilter.js', 'sql.js']);
3535

36-
$pageSettings = new PageSettings('Sql');
36+
$pageSettings = new PageSettings();
37+
$pageSettings->init('Sql');
3738
$this->response->addHTML($pageSettings->getErrorHTML());
3839
$this->response->addHTML($pageSettings->getHTML());
3940
$GLOBALS['errorUrl'] = Url::getFromRoute('/');

‎libraries/classes/Controllers/Sql/SqlController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ public function __invoke(ServerRequest $request): void
5858

5959
$this->checkUserPrivileges->getPrivileges();
6060

61-
$pageSettings = new PageSettings('Browse');
61+
$pageSettings = new PageSettings();
62+
$pageSettings->init('Browse');
6263
$this->response->addHTML($pageSettings->getErrorHTML());
6364
$this->response->addHTML($pageSettings->getHTML());
6465

0 commit comments

Comments
 (0)