feat(STEUN-409): replace deprecated method utf8_encode with mb_conver…

…t_encoding https://php.watch/versions/8.2/utf8_encode-utf8_decode-deprecated#utf8_encode-iso8859-mbstring
ho-nl · May 30, 2023 · f293a7d · f293a7d
1 parent 0e78511
commit f293a7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,8 @@
         "symfony/stopwatch": "^v6.2",
         "bakame/psr7-csv-factory": "^1.0@dev",
         "league/csv": "^9.1",
-        "monolog/monolog": "^2.8"
+        "monolog/monolog": "^2.8",
+        "ext-mbstring": "*"
     },
     "type": "magento2-module",
     "autoload": {

diff --git a/src/Streamer/FileCsv.php b/src/Streamer/FileCsv.php
@@ -99,7 +99,7 @@ public function getIterator()
             $csvReader->setDelimiter($this->delimiter);
         }
         foreach ($csvReader->getIterator() as $row) {
-            yield (empty($this->headers) ? $row : \array_combine($this->headers, \array_map('utf8_encode', $row)));
+            yield (empty($this->headers) ? $row : \array_combine($this->headers, \array_map(self::class . '::mb_convert_encoding', $row)));
         }
     }
 
@@ -112,4 +112,9 @@ private function getRequestFile(): string
             ? $this->requestFile
             : $this->directoryList->getRoot() . '/' . trim($this->requestFile, '/');
     }
+
+    public function mb_convert_encoding($row)
+    {
+        return mb_convert_encoding($row, 'UTF-8', 'ISO-8859-1');
+    }
 }