Skip to content

Commit 87e0c21

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19029 from kamil-tekiela/Refactor-import-3
Use enum instead of constants in Import
2 parents def925e + eb9be36 commit 87e0c21

6 files changed

Lines changed: 118 additions & 159 deletions

File tree

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8570,31 +8570,6 @@ parameters:
85708570
count: 1
85718571
path: src/Import/Ajax.php
85728572

8573-
-
8574-
message: "#^Cannot access offset 0 on mixed\\.$#"
8575-
count: 3
8576-
path: src/Import/Import.php
8577-
8578-
-
8579-
message: "#^Cannot access offset 1 on mixed\\.$#"
8580-
count: 1
8581-
path: src/Import/Import.php
8582-
8583-
-
8584-
message: "#^Cannot access offset 2 on mixed\\.$#"
8585-
count: 1
8586-
path: src/Import/Import.php
8587-
8588-
-
8589-
message: "#^Cannot access offset int on mixed\\.$#"
8590-
count: 3
8591-
path: src/Import/Import.php
8592-
8593-
-
8594-
message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
8595-
count: 2
8596-
path: src/Import/Import.php
8597-
85988573
-
85998574
message: "#^Cannot call method getExtension\\(\\) on mixed\\.$#"
86008575
count: 1
@@ -8605,11 +8580,6 @@ parameters:
86058580
count: 1
86068581
path: src/Import/Import.php
86078582

8608-
-
8609-
message: "#^Cannot cast mixed to int\\.$#"
8610-
count: 1
8611-
path: src/Import/Import.php
8612-
86138583
-
86148584
message: "#^Cannot cast mixed to string\\.$#"
86158585
count: 6

‎psalm-baseline.xml‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6425,27 +6425,12 @@
64256425
<MixedArgument>
64266426
<code><![CDATA[$active]]></code>
64276427
</MixedArgument>
6428-
<MixedArrayAccess>
6429-
<code><![CDATA[$analyses[$i][self::FORMATTEDSQL][$colCount]]]></code>
6430-
<code><![CDATA[$analyses[$i][self::SIZES]]]></code>
6431-
<code><![CDATA[$analyses[$i][self::SIZES][$j]]]></code>
6432-
<code><![CDATA[$analyses[$i][self::TYPES]]]></code>
6433-
<code><![CDATA[$analyses[$i][self::TYPES]]]></code>
6434-
<code><![CDATA[$analyses[$i][self::TYPES]]]></code>
6435-
<code><![CDATA[$analyses[$i][self::TYPES][$colCount]]]></code>
6436-
<code><![CDATA[$analyses[$i][self::TYPES][$j]]]></code>
6437-
<code><![CDATA[$analyses[$i][self::TYPES][$j]]]></code>
6438-
</MixedArrayAccess>
6439-
<MixedArrayOffset>
6440-
<code><![CDATA[$typeArray[$analyses[$i][self::TYPES][$j]]]]></code>
6441-
</MixedArrayOffset>
64426428
<MixedAssignment>
64436429
<code><![CDATA[$active]]></code>
64446430
<code><![CDATA[$cellValue]]></code>
64456431
<code><![CDATA[$charset]]></code>
64466432
<code><![CDATA[$collation]]></code>
64476433
<code><![CDATA[$importPlugin]]></code>
6448-
<code><![CDATA[$size]]></code>
64496434
</MixedAssignment>
64506435
<MixedInferredReturnType>
64516436
<code><![CDATA[string|int]]></code>
@@ -6460,7 +6445,6 @@
64606445
<code><![CDATA[$collation]]></code>
64616446
<code><![CDATA[$collation]]></code>
64626447
<code><![CDATA[$importPlugin->getProperties()->getExtension()]]></code>
6463-
<code><![CDATA[$size]]></code>
64646448
<code><![CDATA[$size[self::D]]]></code>
64656449
<code><![CDATA[ImportSettings::$maximumTime]]></code>
64666450
<code><![CDATA[max($size[self::D], $oldD)]]></code>
@@ -8865,6 +8849,9 @@
88658849
<DeprecatedMethod>
88668850
<code><![CDATA[Config::getInstance()]]></code>
88678851
</DeprecatedMethod>
8852+
<InvalidArgument>
8853+
<code><![CDATA[[$analysis]]]></code>
8854+
</InvalidArgument>
88688855
<InvalidArrayOffset>
88698856
<code><![CDATA[$GLOBALS['buffer']]]></code>
88708857
<code><![CDATA[$GLOBALS['eof']]]></code>

‎src/Import/ColumnType.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace PhpMyAdmin\Import;
6+
7+
enum ColumnType
8+
{
9+
case None;
10+
case Varchar;
11+
case Int;
12+
case Decimal;
13+
case BigInt;
14+
case Geometry;
15+
}

0 commit comments

Comments
 (0)