Move the Import class to the Import namespace

MauricioFauth · MauricioFauth · commit 1f935e57f75d · 2023-06-28T12:44:04.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php
@@ -10,8 +10,8 @@
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Http\ServerRequest;
-use PhpMyAdmin\Import;
 use PhpMyAdmin\Import\Ajax;
+use PhpMyAdmin\Import\Import;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Plugins;
 use PhpMyAdmin\ResponseRenderer;
diff --git a/libraries/classes/Controllers/Import/ImportController.php b/libraries/classes/Controllers/Import/ImportController.php
@@ -14,7 +14,7 @@
 use PhpMyAdmin\Html\Generator;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Identifiers\DatabaseName;
-use PhpMyAdmin\Import;
+use PhpMyAdmin\Import\Import;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\ParseAnalyze;
 use PhpMyAdmin\Plugins;
diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php
@@ -10,8 +10,8 @@
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Http\ServerRequest;
-use PhpMyAdmin\Import;
 use PhpMyAdmin\Import\Ajax;
+use PhpMyAdmin\Import\Import;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Plugins;
 use PhpMyAdmin\ResponseRenderer;
diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php
@@ -11,8 +11,8 @@
 use PhpMyAdmin\DbTableExists;
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Http\ServerRequest;
-use PhpMyAdmin\Import;
 use PhpMyAdmin\Import\Ajax;
+use PhpMyAdmin\Import\Import;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Plugins;
 use PhpMyAdmin\ResponseRenderer;
diff --git a/libraries/classes/Import/Import.php b/libraries/classes/Import/Import.php
@@ -2,14 +2,23 @@
 
 declare(strict_types=1);
 
-namespace PhpMyAdmin;
-
+namespace PhpMyAdmin\Import;
+
+use PhpMyAdmin\CheckUserPrivileges;
+use PhpMyAdmin\Encoding;
+use PhpMyAdmin\File;
+use PhpMyAdmin\FileListing;
+use PhpMyAdmin\Message;
+use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\SqlParser\Statements\DeleteStatement;
 use PhpMyAdmin\SqlParser\Statements\InsertStatement;
 use PhpMyAdmin\SqlParser\Statements\ReplaceStatement;
 use PhpMyAdmin\SqlParser\Statements\UpdateStatement;
 use PhpMyAdmin\SqlParser\Utils\Query;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 use function __;
 use function abs;
diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php
@@ -11,7 +11,7 @@
 namespace PhpMyAdmin\Plugins\Import;
 
 use PhpMyAdmin\File;
-use PhpMyAdmin\Import;
+use PhpMyAdmin\Import\Import;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Plugins\ImportPlugin;
 use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
diff --git a/libraries/classes/Plugins/Import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php
@@ -13,7 +13,7 @@
 use PhpMyAdmin\Gis\GisMultiPoint;
 use PhpMyAdmin\Gis\GisPoint;
 use PhpMyAdmin\Gis\GisPolygon;
-use PhpMyAdmin\Import;
+use PhpMyAdmin\Import\Import;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Plugins\ImportPlugin;
 use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php
@@ -10,7 +10,7 @@
 namespace PhpMyAdmin\Plugins\Import;
 
 use PhpMyAdmin\File;
-use PhpMyAdmin\Import;
+use PhpMyAdmin\Import\Import;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Plugins\ImportPlugin;
 use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
diff --git a/libraries/classes/Plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php
@@ -8,7 +8,7 @@
 namespace PhpMyAdmin\Plugins;
 
 use PhpMyAdmin\File;
-use PhpMyAdmin\Import;
+use PhpMyAdmin\Import\Import;
 use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
 use PhpMyAdmin\Properties\Plugins\PluginPropertyItem;
 
diff --git a/libraries/services.php b/libraries/services.php
@@ -23,7 +23,7 @@
 use PhpMyAdmin\Export\TemplateModel;
 use PhpMyAdmin\FileListing;
 use PhpMyAdmin\FlashMessages;
-use PhpMyAdmin\Import;
+use PhpMyAdmin\Import\Import;
 use PhpMyAdmin\Import\SimulateDml;
 use PhpMyAdmin\InsertEdit;
 use PhpMyAdmin\Navigation\Navigation;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -4330,95 +4330,95 @@ parameters:
 			count: 2
 			path: libraries/classes/Http/ServerRequest.php
 
+		-
+			message: "#^Variable static method call on PhpMyAdmin\\\\Import\\\\Ajax\\.$#"
+			count: 1
+			path: libraries/classes/Import/Ajax.php
+
 		-
 			message: "#^Cannot access offset 0 on mixed\\.$#"
 			count: 3
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Cannot access offset 1 on mixed\\.$#"
 			count: 4
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
 			count: 4
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Cannot call method getProperties\\(\\) on mixed\\.$#"
 			count: 1
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Cannot cast mixed to int\\.$#"
 			count: 1
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Casting to int something that's already int\\.$#"
 			count: 2
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^For loop initial assignment overwrites variable \\$i\\.$#"
 			count: 5
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Foreach overwrites \\$sqlQuery with its value variable\\.$#"
 			count: 1
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Import\\:\\:detectSize\\(\\) should return int\\|string but returns mixed\\.$#"
+			message: "#^Method PhpMyAdmin\\\\Import\\\\Import\\:\\:detectSize\\(\\) should return int\\|string but returns mixed\\.$#"
 			count: 2
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Only numeric types are allowed in \\+, int\\<0, max\\>\\|false given on the left side\\.$#"
 			count: 1
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Only numeric types are allowed in \\-, int\\<0, max\\>\\|false given on the right side\\.$#"
 			count: 2
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
 			count: 2
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
-			message: "#^Parameter \\#1 \\$lastCumulativeSize of method PhpMyAdmin\\\\Import\\:\\:getDecimalPrecision\\(\\) expects string, int\\|string given\\.$#"
+			message: "#^Parameter \\#1 \\$lastCumulativeSize of method PhpMyAdmin\\\\Import\\\\Import\\:\\:getDecimalPrecision\\(\\) expects string, int\\|string given\\.$#"
 			count: 3
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
-			message: "#^Parameter \\#1 \\$lastCumulativeSize of method PhpMyAdmin\\\\Import\\:\\:getDecimalScale\\(\\) expects string, int\\|string given\\.$#"
+			message: "#^Parameter \\#1 \\$lastCumulativeSize of method PhpMyAdmin\\\\Import\\\\Import\\:\\:getDecimalScale\\(\\) expects string, int\\|string given\\.$#"
 			count: 2
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
-			message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Import\\:\\:executeQuery\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Import\\\\Import\\:\\:executeQuery\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
-			message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Import\\:\\:runQuery\\(\\) expects string, \\(array\\<int, string\\>\\|string\\|null\\) given\\.$#"
+			message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Import\\\\Import\\:\\:runQuery\\(\\) expects string, \\(array\\<int, string\\>\\|string\\|null\\) given\\.$#"
 			count: 1
-			path: libraries/classes/Import.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, mixed given\\.$#"
 			count: 4
-			path: libraries/classes/Import.php
-
-		-
-			message: "#^Variable static method call on PhpMyAdmin\\\\Import\\\\Ajax\\.$#"
-			count: 1
-			path: libraries/classes/Import/Ajax.php
+			path: libraries/classes/Import/Import.php
 
 		-
 			message: "#^Argument of an invalid type array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\>\\|null supplied for foreach, only iterables are supported\\.$#"
@@ -5916,7 +5916,7 @@ parameters:
 			path: libraries/classes/Plugins/Import/ImportOds.php
 
 		-
-			message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Import\\:\\:analyzeTable\\(\\) expects array, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Import\\\\Import\\:\\:analyzeTable\\(\\) expects array, mixed given\\.$#"
 			count: 1
 			path: libraries/classes/Plugins/Import/ImportOds.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -6820,7 +6820,22 @@
       <code><![CDATA[imagefilledpolygon($this->image, $points, $color)]]></code>
     </TooFewArguments>
   </file>
-  <file src="libraries/classes/Import.php">
+  <file src="libraries/classes/Import/Ajax.php">
+    <MixedArrayAccess>
+      <code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']]]></code>
+    </MixedArrayAccess>
+    <MixedArrayAssignment>
+      <code><![CDATA[$_SESSION[$sessionKey]['handler']]]></code>
+      <code><![CDATA[$_SESSION[$sessionKey]['handler']]]></code>
+    </MixedArrayAssignment>
+    <MixedMethodCall>
+      <code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']::getUploadStatus($id)]]></code>
+    </MixedMethodCall>
+    <PossiblyInvalidArrayOffset>
+      <code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]]]></code>
+    </PossiblyInvalidArrayOffset>
+  </file>
+  <file src="libraries/classes/Import/Import.php">
     <ArgumentTypeCoercion>
       <code>$sqlDelimiter</code>
     </ArgumentTypeCoercion>
@@ -7017,21 +7032,6 @@
       <code><![CDATA[$GLOBALS['timestamp']]]></code>
     </PossiblyNullOperand>
   </file>
-  <file src="libraries/classes/Import/Ajax.php">
-    <MixedArrayAccess>
-      <code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']]]></code>
-    </MixedArrayAccess>
-    <MixedArrayAssignment>
-      <code><![CDATA[$_SESSION[$sessionKey]['handler']]]></code>
-      <code><![CDATA[$_SESSION[$sessionKey]['handler']]]></code>
-    </MixedArrayAssignment>
-    <MixedMethodCall>
-      <code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]['handler']::getUploadStatus($id)]]></code>
-    </MixedMethodCall>
-    <PossiblyInvalidArrayOffset>
-      <code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]]]></code>
-    </PossiblyInvalidArrayOffset>
-  </file>
   <file src="libraries/classes/Import/SimulateDml.php">
     <MixedArgument>
       <code><![CDATA[$set->value]]></code>
@@ -14196,12 +14196,7 @@
       <code>providerForTestValidNames</code>
     </PossiblyUnusedMethod>
   </file>
-  <file src="test/classes/Import/SimulateDmlTest.php">
-    <PossiblyUnusedMethod>
-      <code>providerForTestGetMatchedRows</code>
-    </PossiblyUnusedMethod>
-  </file>
-  <file src="test/classes/ImportTest.php">
+  <file src="test/classes/Import/ImportTest.php">
     <DocblockTypeContradiction>
       <code>assertSame</code>
       <code>assertSame</code>
@@ -14224,6 +14219,11 @@
       <code>assertNull</code>
     </TypeDoesNotContainNull>
   </file>
+  <file src="test/classes/Import/SimulateDmlTest.php">
+    <PossiblyUnusedMethod>
+      <code>providerForTestGetMatchedRows</code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="test/classes/IndexTest.php">
     <MixedArgument>
       <code><![CDATA[$this->params['columns']]]></code>
diff --git a/test/classes/Import/ImportTest.php b/test/classes/Import/ImportTest.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace PhpMyAdmin\Tests;
+namespace PhpMyAdmin\Tests\Import;
 
-use PhpMyAdmin\Import;
+use PhpMyAdmin\Import\Import;
+use PhpMyAdmin\Tests\AbstractTestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 
