Skip to content

Commit 5aeaca0

Browse files
MauricioFauthMauricioFauth
committed
Remove unnecessary global vars from QBE controller
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 613678f commit 5aeaca0

2 files changed

Lines changed: 17 additions & 28 deletions

File tree

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

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,33 @@ public function __construct(
4242

4343
public function __invoke(ServerRequest $request): void
4444
{
45-
$GLOBALS['savedSearchList'] ??= null;
46-
$GLOBALS['savedSearch'] ??= null;
47-
$GLOBALS['currentSearchId'] ??= null;
4845
$GLOBALS['goto'] ??= null;
4946
$GLOBALS['urlParams'] ??= null;
5047
$GLOBALS['errorUrl'] ??= null;
5148

5249
$savedQbeSearchesFeature = $this->relation->getRelationParameters()->savedQueryByExampleSearchesFeature;
5350

54-
$GLOBALS['savedSearchList'] = [];
55-
$GLOBALS['savedSearch'] = null;
56-
$GLOBALS['currentSearchId'] = null;
51+
$savedSearchList = [];
52+
$savedSearch = null;
5753
$this->addScriptFiles(['database/qbe.js']);
5854
if ($savedQbeSearchesFeature !== null) {
5955
//Get saved search list.
60-
$GLOBALS['savedSearch'] = new SavedSearches();
61-
$GLOBALS['savedSearch']->setUsername($GLOBALS['cfg']['Server']['user'])
56+
$savedSearch = new SavedSearches();
57+
$savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
6258
->setDbname($GLOBALS['db']);
6359

6460
$searchId = $request->getParsedBodyParam('searchId');
6561
if (! empty($searchId)) {
66-
$GLOBALS['savedSearch']->setId($searchId);
62+
$savedSearch->setId($searchId);
6763
}
6864

6965
//Action field is sent.
7066
if ($request->hasBodyParam('action')) {
71-
$GLOBALS['savedSearch']->setSearchName($request->getParsedBodyParam('searchName'));
67+
$savedSearch->setSearchName($request->getParsedBodyParam('searchName'));
7268
$action = $request->getParsedBodyParam('action');
7369
if ($action === 'create') {
7470
try {
75-
$GLOBALS['savedSearch']->setId(null)
71+
$savedSearch->setId(null)
7672
->setCriterias($request->getParsedBody())
7773
->save($savedQbeSearchesFeature);
7874
} catch (SavedSearchesException $exception) {
@@ -84,7 +80,7 @@ public function __invoke(ServerRequest $request): void
8480
}
8581
} elseif ($action === 'update') {
8682
try {
87-
$GLOBALS['savedSearch']->setCriterias($request->getParsedBody())
83+
$savedSearch->setCriterias($request->getParsedBody())
8884
->save($savedQbeSearchesFeature);
8985
} catch (SavedSearchesException $exception) {
9086
$this->response->setRequestStatus(false);
@@ -95,7 +91,7 @@ public function __invoke(ServerRequest $request): void
9591
}
9692
} elseif ($action === 'delete') {
9793
try {
98-
$GLOBALS['savedSearch']->delete($savedQbeSearchesFeature);
94+
$savedSearch->delete($savedQbeSearchesFeature);
9995
} catch (SavedSearchesException $exception) {
10096
$this->response->setRequestStatus(false);
10197
$this->response->addJSON('fieldWithError', 'searchId');
@@ -105,20 +101,20 @@ public function __invoke(ServerRequest $request): void
105101
}
106102

107103
//After deletion, reset search.
108-
$GLOBALS['savedSearch'] = new SavedSearches();
109-
$GLOBALS['savedSearch']->setUsername($GLOBALS['cfg']['Server']['user'])
104+
$savedSearch = new SavedSearches();
105+
$savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
110106
->setDbname($GLOBALS['db']);
111107
$_POST = [];
112108
} elseif ($action === 'load') {
113109
if (empty($searchId)) {
114110
//when not loading a search, reset the object.
115-
$GLOBALS['savedSearch'] = new SavedSearches();
116-
$GLOBALS['savedSearch']->setUsername($GLOBALS['cfg']['Server']['user'])
111+
$savedSearch = new SavedSearches();
112+
$savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
117113
->setDbname($GLOBALS['db']);
118114
$_POST = [];
119115
} else {
120116
try {
121-
$GLOBALS['savedSearch']->load($savedQbeSearchesFeature);
117+
$savedSearch->load($savedQbeSearchesFeature);
122118
} catch (SavedSearchesException $exception) {
123119
$this->response->setRequestStatus(false);
124120
$this->response->addJSON('fieldWithError', 'searchId');
@@ -131,8 +127,7 @@ public function __invoke(ServerRequest $request): void
131127
//Else, it's an "update query"
132128
}
133129

134-
$GLOBALS['savedSearchList'] = $GLOBALS['savedSearch']->getList($savedQbeSearchesFeature);
135-
$GLOBALS['currentSearchId'] = $GLOBALS['savedSearch']->getId();
130+
$savedSearchList = $savedSearch->getList($savedQbeSearchesFeature);
136131
}
137132

138133
/**
@@ -189,8 +184,8 @@ public function __invoke(ServerRequest $request): void
189184
$this->template,
190185
$this->dbi,
191186
$GLOBALS['db'],
192-
$GLOBALS['savedSearchList'],
193-
$GLOBALS['savedSearch']
187+
$savedSearchList,
188+
$savedSearch
194189
);
195190

196191
$this->render('database/qbe/index', [

‎psalm-baseline.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,21 +1835,15 @@
18351835
</file>
18361836
<file src="libraries/classes/Controllers/Database/QueryByExampleController.php">
18371837
<InvalidArrayOffset>
1838-
<code><![CDATA[$GLOBALS['currentSearchId']]]></code>
18391838
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
1840-
<code><![CDATA[$GLOBALS['savedSearch']]]></code>
1841-
<code><![CDATA[$GLOBALS['savedSearchList']]]></code>
18421839
</InvalidArrayOffset>
18431840
<MixedArgument>
18441841
<code><![CDATA[$request->getParsedBodyParam('db')]]></code>
18451842
<code><![CDATA[$request->getParsedBodyParam('searchName')]]></code>
18461843
<code>$searchId</code>
18471844
</MixedArgument>
18481845
<MixedAssignment>
1849-
<code><![CDATA[$GLOBALS['currentSearchId']]]></code>
18501846
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
1851-
<code><![CDATA[$GLOBALS['savedSearch']]]></code>
1852-
<code><![CDATA[$GLOBALS['savedSearchList']]]></code>
18531847
<code>$action</code>
18541848
<code>$searchId</code>
18551849
</MixedAssignment>

0 commit comments

Comments
 (0)