Merge pull request #19063 from kamil-tekiela/Refactor-import-11

MauricioFauth · web-flow · commit 1c7c48b3b6e5 · 2024-03-18T15:07:13.000-03:00
Replace remaining $_POST in ImportCsv
diff --git a/src/Plugins/Import/ImportCsv.php b/src/Plugins/Import/ImportCsv.php
@@ -54,6 +54,8 @@ class ImportCsv extends AbstractImportCsv
      */
     private bool $analyze = false;
 
+    private bool $replace = false;
+    private bool $ignore = false;
     private string $terminated = '';
     private string $enclosed = '';
     private string $escaped = '';
@@ -163,6 +165,8 @@ protected function setProperties(): ImportPluginProperties
 
     public function setImportOptions(ServerRequest $request): void
     {
+        $this->replace = $request->getParsedBodyParam('csv_replace') !== null;
+        $this->ignore = $request->getParsedBodyParam('csv_ignore') !== null;
         $this->terminated = (string) $request->getParsedBodyParam('csv_terminated');
         $this->enclosed = (string) $request->getParsedBodyParam('csv_enclosed');
         $this->escaped = (string) $request->getParsedBodyParam('csv_escaped');
@@ -183,9 +187,6 @@ public function doImport(File|null $importHandle = null): array
         $GLOBALS['message'] ??= null;
         $GLOBALS['errorUrl'] ??= null;
 
-        // $csv_replace and $csv_ignore should have been here,
-        // but we use directly from $_POST
-
         $replacements = ['\\n' => "\n", '\\t' => "\t", '\\r' => "\r"];
         $this->terminated = strtr($this->terminated, $replacements);
         $this->enclosed = strtr($this->enclosed, $replacements);
@@ -523,7 +524,7 @@ public function doImport(File|null $importHandle = null): array
                     }
 
                     $sql .= ')';
-                    if (isset($_POST['csv_replace'])) {
+                    if ($this->replace) {
                         $sql .= ' ON DUPLICATE KEY UPDATE ';
                         foreach ($fields as $field) {
                             $fieldName = Util::backquote($field);
@@ -738,7 +739,7 @@ private function getSqlTemplateAndRequiredFields(
         $fields = [];
         if (! $this->analyze && $db !== null && $table !== null) {
             $sqlTemplate = 'INSERT';
-            if (isset($_POST['csv_ignore'])) {
+            if ($this->ignore) {
                 $sqlTemplate .= ' IGNORE';
             }
 
