Skip to content

Commit 17c477b

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19501 from MauricioFauth/error-global-variable
Remove error global variable
2 parents a6350ad + 4b30f0e commit 17c477b

25 files changed

Lines changed: 80 additions & 191 deletions

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -2964,12 +2964,6 @@ parameters:
29642964
count: 1
29652965
path: src/Controllers/Import/ImportController.php
29662966

2967-
-
2968-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
2969-
identifier: booleanNot.exprNotBoolean
2970-
count: 5
2971-
path: src/Controllers/Import/ImportController.php
2972-
29732967
-
29742968
message: '#^Only booleans are allowed in an if condition, mixed given\.$#'
29752969
identifier: if.condNotBoolean
@@ -2994,12 +2988,6 @@ parameters:
29942988
count: 2
29952989
path: src/Controllers/Import/ImportController.php
29962990

2997-
-
2998-
message: '#^Parameter \#5 \$exit of static method PhpMyAdmin\\Html\\Generator\:\:mysqlDie\(\) expects bool, mixed given\.$#'
2999-
identifier: argument.type
3000-
count: 1
3001-
path: src/Controllers/Import/ImportController.php
3002-
30032991
-
30042992
message: '#^Result of \|\| is always true\.$#'
30052993
identifier: booleanOr.alwaysTrue
@@ -3255,12 +3243,6 @@ parameters:
32553243
count: 1
32563244
path: src/Controllers/Preferences/ManageController.php
32573245

3258-
-
3259-
message: '#^Only booleans are allowed in an if condition, PhpMyAdmin\\Message\|string given\.$#'
3260-
identifier: if.condNotBoolean
3261-
count: 1
3262-
path: src/Controllers/Preferences/ManageController.php
3263-
32643246
-
32653247
message: '#^Only numeric types are allowed in \+, int\<0, max\>\|false given on the left side\.$#'
32663248
identifier: plus.leftNonNumeric
@@ -9363,18 +9345,6 @@ parameters:
93639345
count: 1
93649346
path: src/Import/Import.php
93659347

9366-
-
9367-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
9368-
identifier: booleanNot.exprNotBoolean
9369-
count: 1
9370-
path: src/Import/Import.php
9371-
9372-
-
9373-
message: '#^Only booleans are allowed in an if condition, mixed given\.$#'
9374-
identifier: if.condNotBoolean
9375-
count: 1
9376-
path: src/Import/Import.php
9377-
93789348
-
93799349
message: '#^Parameter \#1 \$precision of static method PhpMyAdmin\\Import\\DecimalSize\:\:fromPrecisionAndScale\(\) expects int, int\|PhpMyAdmin\\Import\\DecimalSize given\.$#'
93809350
identifier: argument.type
@@ -12846,12 +12816,6 @@ parameters:
1284612816
count: 1
1284712817
path: src/Plugins/Import/ImportCsv.php
1284812818

12849-
-
12850-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
12851-
identifier: booleanNot.exprNotBoolean
12852-
count: 1
12853-
path: src/Plugins/Import/ImportCsv.php
12854-
1285512819
-
1285612820
message: '#^Parameter \#1 \$columnNames of method PhpMyAdmin\\Plugins\\Import\\ImportCsv\:\:getColumnNames\(\) expects list\<string\>, array\|null given\.$#'
1285712821
identifier: argument.type
@@ -12894,12 +12858,6 @@ parameters:
1289412858
count: 1
1289512859
path: src/Plugins/Import/ImportMediawiki.php
1289612860

12897-
-
12898-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
12899-
identifier: booleanNot.exprNotBoolean
12900-
count: 1
12901-
path: src/Plugins/Import/ImportMediawiki.php
12902-
1290312861
-
1290412862
message: '#^Cannot access property \$body on SimpleXMLElement\|null\.$#'
1290512863
identifier: property.nonObject
@@ -12960,12 +12918,6 @@ parameters:
1296012918
count: 2
1296112919
path: src/Plugins/Import/ImportOds.php
1296212920

12963-
-
12964-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
12965-
identifier: booleanNot.exprNotBoolean
12966-
count: 1
12967-
path: src/Plugins/Import/ImportOds.php
12968-
1296912921
-
1297012922
message: '#^Parameter \#1 \$cellAttrs of method PhpMyAdmin\\Plugins\\Import\\ImportOds\:\:getValue\(\) expects SimpleXMLElement, \(SimpleXMLElement\|null\) given\.$#'
1297112923
identifier: argument.type
@@ -13086,18 +13038,6 @@ parameters:
1308613038
count: 1
1308713039
path: src/Plugins/Import/ImportSql.php
1308813040

13089-
-
13090-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
13091-
identifier: booleanNot.exprNotBoolean
13092-
count: 2
13093-
path: src/Plugins/Import/ImportSql.php
13094-
13095-
-
13096-
message: '#^Only booleans are allowed in an if condition, mixed given\.$#'
13097-
identifier: if.condNotBoolean
13098-
count: 1
13099-
path: src/Plugins/Import/ImportSql.php
13100-
1310113041
-
1310213042
message: '#^Parameter \#1 \$delimiter of method PhpMyAdmin\\SqlParser\\Utils\\BufferedQuery\:\:setDelimiter\(\) expects string, mixed given\.$#'
1310313043
identifier: argument.type
@@ -13158,12 +13098,6 @@ parameters:
1315813098
count: 4
1315913099
path: src/Plugins/Import/ImportXml.php
1316013100

13161-
-
13162-
message: '#^Only booleans are allowed in a negated boolean, mixed given\.$#'
13163-
identifier: booleanNot.exprNotBoolean
13164-
count: 1
13165-
path: src/Plugins/Import/ImportXml.php
13166-
1316713101
-
1316813102
message: '#^Method PhpMyAdmin\\Plugins\\Import\\ShapeFileImport\:\:readSHP\(\) never returns false so it can be removed from the return type\.$#'
1316913103
identifier: return.unusedType

‎psalm-baseline.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,9 +1918,6 @@
19181918
<code><![CDATA[is_array($_FILES['import_file'])]]></code>
19191919
<code><![CDATA[is_string($_FILES['import_file']['tmp_name'])]]></code>
19201920
</RedundantCondition>
1921-
<RiskyTruthyFalsyComparison>
1922-
<code><![CDATA[$GLOBALS['error']]]></code>
1923-
</RiskyTruthyFalsyComparison>
19241921
</file>
19251922
<file src="src/Controllers/Preferences/NavigationController.php">
19261923
<DeprecatedMethod>
@@ -7529,9 +7526,6 @@
75297526
<code><![CDATA[$values[count($values) - 1]]]></code>
75307527
<code><![CDATA[$values[count($values) - 1]]]></code>
75317528
</InvalidArrayOffset>
7532-
<MixedAssignment>
7533-
<code><![CDATA[$GLOBALS['error']]]></code>
7534-
</MixedAssignment>
75357529
<PossiblyNullOperand>
75367530
<code><![CDATA[$ch]]></code>
75377531
</PossiblyNullOperand>

‎src/Controllers/Import/ImportController.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public function __invoke(ServerRequest $request): Response
6464
$GLOBALS['display_query'] ??= null;
6565
$GLOBALS['ajax_reload'] ??= null;
6666
$GLOBALS['import_text'] ??= null;
67-
$GLOBALS['error'] ??= null;
6867
$GLOBALS['result'] ??= null;
6968

7069
ImportSettings::$charsetOfFile = $request->getParsedBodyParamAsString('charset_of_file', '');
@@ -240,7 +239,7 @@ public function __invoke(ServerRequest $request): Response
240239

241240
// set default values
242241
ImportSettings::$timeoutPassed = false;
243-
$GLOBALS['error'] = false;
242+
Import::$hasError = false;
244243
ImportSettings::$readMultiply = 1;
245244
ImportSettings::$finished = false;
246245
ImportSettings::$offset = 0;
@@ -333,7 +332,7 @@ public function __invoke(ServerRequest $request): Response
333332
}
334333

335334
ImportSettings::$runQuery = false;
336-
$GLOBALS['error'] = true; // this is kind of hack to skip processing the query
335+
Import::$hasError = true; // this is kind of hack to skip processing the query
337336
break;
338337
}
339338
}
@@ -394,7 +393,7 @@ public function __invoke(ServerRequest $request): Response
394393

395394
// Do we have file to import?
396395
397-
if (ImportSettings::$importFile !== 'none' && ! $GLOBALS['error']) {
396+
if (ImportSettings::$importFile !== 'none' && ! Import::$hasError) {
398397
/**
399398
* Handle file compression
400399
*/
@@ -431,7 +430,7 @@ public function __invoke(ServerRequest $request): Response
431430

432431
return $this->response->response();
433432
}
434-
} elseif (! $GLOBALS['error'] && empty($GLOBALS['import_text'])) {
433+
} elseif (! Import::$hasError && empty($GLOBALS['import_text'])) {
435434
Current::$message = Message::error(
436435
__(
437436
'No data was received to import. Either no file name was ' .
@@ -463,7 +462,7 @@ public function __invoke(ServerRequest $request): Response
463462
}
464463

465464
// Something to skip? (because timeout has passed)
466-
if (! $GLOBALS['error'] && $request->hasBodyParam('skip')) {
465+
if (! Import::$hasError && $request->hasBodyParam('skip')) {
467466
$originalSkip = $skip = (int) $request->getParsedBodyParamAsStringOrNull('skip');
468467
while ($skip > 0 && ! ImportSettings::$finished) {
469468
$this->import->getNextChunk(
@@ -482,7 +481,7 @@ public function __invoke(ServerRequest $request): Response
482481
// and complete valid sql statement (which affected for rows)
483482
$queriesToBeExecuted = [];
484483

485-
if (! $GLOBALS['error']) {
484+
if (! Import::$hasError) {
486485
$importPlugin = new ($importFormat->getClassName());
487486

488487
$importPlugin->setImportOptions($request);
@@ -513,10 +512,10 @@ public function __invoke(ServerRequest $request): Response
513512
if ($idBookmark !== 0 && $actionBookmark === 2) {
514513
Current::$message = Message::success(__('The bookmark has been deleted.'));
515514
$GLOBALS['display_query'] = $GLOBALS['import_text'];
516-
$GLOBALS['error'] = false; // unset error marker, it was used just to skip processing
515+
Import::$hasError = false; // unset error marker, it was used just to skip processing
517516
} elseif ($idBookmark !== 0 && $actionBookmark === 1) {
518517
Current::$message = Message::notice(__('Showing bookmark'));
519-
} elseif (ImportSettings::$finished && ! $GLOBALS['error']) {
518+
} elseif (ImportSettings::$finished && ! Import::$hasError) {
520519
// Do not display the query with message, we do it separately
521520
$GLOBALS['display_query'] = ';';
522521
if (ImportSettings::$importType !== 'query') {
@@ -604,7 +603,7 @@ public function __invoke(ServerRequest $request): Response
604603
}
605604

606605
foreach (ImportSettings::$failedQueries as $die) {
607-
Generator::mysqlDie($die['error'], $die['sql'], false, $GLOBALS['errorUrl'], $GLOBALS['error']);
606+
Generator::mysqlDie($die['error'], $die['sql'], false, $GLOBALS['errorUrl'], Import::$hasError);
608607
}
609608

610609
if (ImportSettings::$goSql) {

‎src/Controllers/Preferences/ExportController.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public function __construct(
3535

3636
public function __invoke(ServerRequest $request): Response
3737
{
38-
$GLOBALS['error'] ??= null;
39-
4038
$configFile = new ConfigFile($this->config->baseSettings);
4139
$this->userPreferences->pageInit($configFile);
4240

@@ -50,7 +48,7 @@ public function __invoke(ServerRequest $request): Response
5048
return $this->response->response();
5149
}
5250

53-
$GLOBALS['error'] = null;
51+
$result = null;
5452
if ($formDisplay->process(false) && ! $formDisplay->hasErrors()) {
5553
// Load 2FA settings
5654
$twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
@@ -66,8 +64,6 @@ public function __invoke(ServerRequest $request): Response
6664

6765
return $this->response->response();
6866
}
69-
70-
$GLOBALS['error'] = $result;
7167
}
7268

7369
$relationParameters = $this->relation->getRelationParameters();
@@ -81,7 +77,7 @@ public function __invoke(ServerRequest $request): Response
8177
$formErrors = $formDisplay->displayErrors();
8278

8379
$this->response->render('preferences/forms/main', [
84-
'error' => $GLOBALS['error'] instanceof Message ? $GLOBALS['error']->getDisplay() : '',
80+
'error' => $result instanceof Message ? $result->getDisplay() : '',
8581
'has_errors' => $formDisplay->hasErrors(),
8682
'errors' => $formErrors,
8783
'form' => $formDisplay->getDisplay(

‎src/Controllers/Preferences/FeaturesController.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public function __construct(
3535

3636
public function __invoke(ServerRequest $request): Response
3737
{
38-
$GLOBALS['error'] ??= null;
39-
4038
$configFile = new ConfigFile($this->config->baseSettings);
4139
$this->userPreferences->pageInit($configFile);
4240

@@ -50,7 +48,7 @@ public function __invoke(ServerRequest $request): Response
5048
return $this->response->response();
5149
}
5250

53-
$GLOBALS['error'] = null;
51+
$result = null;
5452
if ($formDisplay->process(false) && ! $formDisplay->hasErrors()) {
5553
// Load 2FA settings
5654
$twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
@@ -66,8 +64,6 @@ public function __invoke(ServerRequest $request): Response
6664

6765
return $this->response->response();
6866
}
69-
70-
$GLOBALS['error'] = $result;
7167
}
7268

7369
$relationParameters = $this->relation->getRelationParameters();
@@ -81,7 +77,7 @@ public function __invoke(ServerRequest $request): Response
8177
$formErrors = $formDisplay->displayErrors();
8278

8379
$this->response->render('preferences/forms/main', [
84-
'error' => $GLOBALS['error'] instanceof Message ? $GLOBALS['error']->getDisplay() : '',
80+
'error' => $result instanceof Message ? $result->getDisplay() : '',
8581
'has_errors' => $formDisplay->hasErrors(),
8682
'errors' => $formErrors,
8783
'form' => $formDisplay->getDisplay(

‎src/Controllers/Preferences/ImportController.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public function __construct(
3535

3636
public function __invoke(ServerRequest $request): Response
3737
{
38-
$GLOBALS['error'] ??= null;
39-
4038
$configFile = new ConfigFile($this->config->baseSettings);
4139
$this->userPreferences->pageInit($configFile);
4240

@@ -50,7 +48,7 @@ public function __invoke(ServerRequest $request): Response
5048
return $this->response->response();
5149
}
5250

53-
$GLOBALS['error'] = null;
51+
$result = null;
5452
if ($formDisplay->process(false) && ! $formDisplay->hasErrors()) {
5553
// Load 2FA settings
5654
$twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
@@ -66,8 +64,6 @@ public function __invoke(ServerRequest $request): Response
6664

6765
return $this->response->response();
6866
}
69-
70-
$GLOBALS['error'] = $result;
7167
}
7268

7369
$relationParameters = $this->relation->getRelationParameters();
@@ -81,7 +77,7 @@ public function __invoke(ServerRequest $request): Response
8177
$formErrors = $formDisplay->displayErrors();
8278

8379
$this->response->render('preferences/forms/main', [
84-
'error' => $GLOBALS['error'] instanceof Message ? $GLOBALS['error']->getDisplay() : '',
80+
'error' => $result instanceof Message ? $result->getDisplay() : '',
8581
'has_errors' => $formDisplay->hasErrors(),
8682
'errors' => $formErrors,
8783
'form' => $formDisplay->getDisplay(

‎src/Controllers/Preferences/MainPanelController.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public function __construct(
3535

3636
public function __invoke(ServerRequest $request): Response
3737
{
38-
$GLOBALS['error'] ??= null;
39-
4038
$configFile = new ConfigFile($this->config->baseSettings);
4139
$this->userPreferences->pageInit($configFile);
4240

@@ -50,7 +48,7 @@ public function __invoke(ServerRequest $request): Response
5048
return $this->response->response();
5149
}
5250

53-
$GLOBALS['error'] = null;
51+
$result = null;
5452
if ($formDisplay->process(false) && ! $formDisplay->hasErrors()) {
5553
// Load 2FA settings
5654
$twoFactor = new TwoFactor(Config::getInstance()->selectedServer['user']);
@@ -66,8 +64,6 @@ public function __invoke(ServerRequest $request): Response
6664

6765
return $this->response->response();
6866
}
69-
70-
$GLOBALS['error'] = $result;
7167
}
7268

7369
$relationParameters = $this->relation->getRelationParameters();
@@ -81,7 +77,7 @@ public function __invoke(ServerRequest $request): Response
8177
$formErrors = $formDisplay->displayErrors();
8278

8379
$this->response->render('preferences/forms/main', [
84-
'error' => $GLOBALS['error'] instanceof Message ? $GLOBALS['error']->getDisplay() : '',
80+
'error' => $result instanceof Message ? $result->getDisplay() : '',
8581
'has_errors' => $formDisplay->hasErrors(),
8682
'errors' => $formErrors,
8783
'form' => $formDisplay->getDisplay(

0 commit comments

Comments
 (0)