Skip to content

Commit dc01d79

Browse files
MauricioFauthMauricioFauth
committed
Replace SqlParser\Token::TYPE_ with SqlParser\TokenType
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent bd0972a commit dc01d79

2 files changed

Lines changed: 29 additions & 43 deletions

File tree

‎psalm-baseline.xml‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9626,6 +9626,13 @@
96269626
</PossiblyUnusedReturnValue>
96279627
</file>
96289628
<file src="src/Plugins/Import/ImportShp.php">
9629+
<DeprecatedMethod>
9630+
<code>Config::getInstance()</code>
9631+
<code>DatabaseInterface::getInstance()</code>
9632+
</DeprecatedMethod>
9633+
<InvalidArgument>
9634+
<code>$sqlStatements</code>
9635+
</InvalidArgument>
96299636
<InvalidArrayOffset>
96309637
<code><![CDATA[$GLOBALS['buffer']]]></code>
96319638
<code><![CDATA[$GLOBALS['eof']]]></code>
@@ -9636,22 +9643,16 @@
96369643
<code><![CDATA[$GLOBALS['buffer']]]></code>
96379644
<code><![CDATA[$GLOBALS['buffer']]]></code>
96389645
<code><![CDATA[$GLOBALS['importHandle']]]></code>
9639-
<code>$dbfFileName</code>
96409646
<code>$dbfFilePath</code>
96419647
<code>$dbfFilePath</code>
9642-
<code>$extracted</code>
9643-
<code>$result</code>
9644-
<code><![CDATA[$shp->getDBFHeader()]]></code>
9648+
<code>$gisType</code>
96459649
</MixedArgument>
96469650
<MixedArrayAccess>
96479651
<code>$c[0]</code>
9648-
<code>$dbfHeader[$n]</code>
96499652
<code>$dbfHeader[$n][0]</code>
96509653
</MixedArrayAccess>
96519654
<MixedArrayAssignment>
9652-
<code>$analyses[$tableNo][Import::FORMATTEDSQL]</code>
96539655
<code>$analyses[$tableNo][Import::FORMATTEDSQL][$spatialCol]</code>
9654-
<code>$analyses[$tableNo][Import::TYPES]</code>
96559656
<code>$analyses[$tableNo][Import::TYPES][$spatialCol]</code>
96569657
</MixedArrayAssignment>
96579658
<MixedArrayOffset>
@@ -9662,38 +9663,29 @@
96629663
<code><![CDATA[$GLOBALS['eof']]]></code>
96639664
<code><![CDATA[$GLOBALS['importHandle']]]></code>
96649665
<code><![CDATA[$GLOBALS['local_import_file']]]></code>
9665-
<code><![CDATA[$GLOBALS['message']]]></code>
9666-
<code><![CDATA[$GLOBALS['message']]]></code>
9667-
<code><![CDATA[$GLOBALS['message']]]></code>
9668-
<code>$analyses[]</code>
96699666
<code>$c</code>
96709667
<code>$colNames[]</code>
9671-
<code>$config</code>
9672-
<code>$dbfFileName</code>
9673-
<code>$dbfFileName</code>
9674-
<code>$dbfHeader</code>
9675-
<code>$extracted</code>
9676-
<code>$result</code>
9677-
<code>$temp</code>
96789668
</MixedAssignment>
96799669
<MixedOperand>
96809670
<code><![CDATA[$GLOBALS['buffer']]]></code>
9681-
<code>$dbfFileName</code>
9682-
<code>$temp</code>
9671+
<code><![CDATA[$gisObj->getShape($record->shpData)]]></code>
96839672
</MixedOperand>
9684-
<MixedPropertyFetch>
9685-
<code><![CDATA[$config->settings]]></code>
9686-
</MixedPropertyFetch>
9687-
<MixedReturnTypeCoercion>
9688-
<code>$sqlStatements</code>
9689-
<code>string[]</code>
9690-
</MixedReturnTypeCoercion>
9673+
<PossiblyInvalidArrayAssignment>
9674+
<code>$analyses[$tableNo][Import::FORMATTEDSQL]</code>
9675+
<code>$analyses[$tableNo][Import::TYPES]</code>
9676+
</PossiblyInvalidArrayAssignment>
96919677
<PossiblyNullArgument>
96929678
<code><![CDATA[$GLOBALS['buffer']]]></code>
96939679
<code><![CDATA[$GLOBALS['buffer']]]></code>
96949680
<code><![CDATA[$GLOBALS['import_file']]]></code>
96959681
<code><![CDATA[$GLOBALS['import_file']]]></code>
9682+
<code><![CDATA[$GLOBALS['import_file']]]></code>
9683+
<code><![CDATA[$GLOBALS['import_file']]]></code>
9684+
<code><![CDATA[$shp->getDBFHeader()]]></code>
96969685
</PossiblyNullArgument>
9686+
<PossiblyNullIterator>
9687+
<code><![CDATA[$shp->getDBFHeader()]]></code>
9688+
</PossiblyNullIterator>
96979689
<PossiblyUnusedReturnValue>
96989690
<code>string[]</code>
96999691
</PossiblyUnusedReturnValue>
@@ -15533,6 +15525,7 @@
1553315525
</InvalidArrayOffset>
1553415526
<MixedArgument>
1553515527
<code><![CDATA[$GLOBALS['import_notice']]]></code>
15528+
<code><![CDATA[$GLOBALS['import_notice']]]></code>
1553615529
</MixedArgument>
1553715530
<RedundantCondition>
1553815531
<code>assertFalse</code>

‎src/Plugins/Export/ExportSql.php‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
use PhpMyAdmin\SqlParser\Parser;
3030
use PhpMyAdmin\SqlParser\Statements\CreateStatement;
3131
use PhpMyAdmin\SqlParser\Token;
32+
use PhpMyAdmin\SqlParser\TokenType;
3233
use PhpMyAdmin\Triggers\Triggers;
3334
use PhpMyAdmin\Util;
3435
use PhpMyAdmin\Version;
3536

3637
use function __;
3738
use function array_keys;
3839
use function bin2hex;
39-
use function count;
4040
use function defined;
4141
use function explode;
4242
use function implode;
@@ -2570,21 +2570,14 @@ public function replaceWithAliases(
25702570
|| $statement->options->has('VIEW')
25712571
) {
25722572
// Replacing the body.
2573-
/** @infection-ignore-all */
2574-
for ($i = 0, $count = count($statement->body); $i < $count; ++$i) {
2575-
$token = $statement->body[$i];
2576-
2577-
// Replacing only symbols (that are not variables) and unknown
2578-
// identifiers.
2579-
$isSymbol = $token->type === Token::TYPE_SYMBOL;
2580-
$isKeyword = $token->type === Token::TYPE_KEYWORD;
2581-
$isNone = $token->type === Token::TYPE_NONE;
2582-
$replaceToken = $isSymbol
2583-
&& (($token->flags & Token::FLAG_SYMBOL_VARIABLE) === 0)
2584-
|| ($isKeyword
2585-
&& (($token->flags & Token::FLAG_KEYWORD_RESERVED) === 0)
2586-
|| $isNone);
2587-
2573+
foreach ($statement->body as $token) {
2574+
// Replacing only symbols (that are not variables) and unknown identifiers.
2575+
$isSymbol = $token->type === TokenType::Symbol;
2576+
$isKeyword = $token->type === TokenType::Keyword;
2577+
$isNone = $token->type === TokenType::None;
2578+
$replaceToken = $isSymbol && ($token->flags & Token::FLAG_SYMBOL_VARIABLE) === 0
2579+
|| $isKeyword && ($token->flags & Token::FLAG_KEYWORD_RESERVED) === 0
2580+
|| $isNone;
25882581
if (! $replaceToken) {
25892582
continue;
25902583
}

0 commit comments

Comments
 (0)