Merge pull request #32 from ho-nl/JeroenVanLeusden-patch-1

Allow setting custom escape character for FileCsv reader
ho-nl · Apr 26, 2022 · 1d21300 · 1d21300
2 parents fc838f1 + ecefc7d
commit 1d21300
Showing 1 changed file with 14 additions and 20 deletions.
diff --git a/src/Streamer/FileCsv.php b/src/Streamer/FileCsv.php
@@ -22,50 +22,44 @@
  */
 class FileCsv
 {
-    /**
-     * @var string
-     */
+    /** @var string $requestFile */
     private $requestFile;
 
-    /**
-     * @var ConsoleOutput
-     */
+    /** @var ConsoleOutput $consoleOutput */
     private $consoleOutput;
 
-    /**
-     * @var DirectoryList
-     */
+    /** @var DirectoryList $directoryList */
     private $directoryList;
 
-    /**
-     * @var Log
-     */
+    /** @var Log $log */
     private $log;
 
-    /**
-     * @var string
-     */
+    /** @var string $delimiter */
     private $delimiter;
 
-    /**
-     * @var array
-     */
+    /** @var array $headers */
     private $headers;
 
+    /** @var string $escapeCharacter */
+    private $escapeCharacter;
+
     /**
      * @param ConsoleOutput $consoleOutput
      * @param DirectoryList $directoryList
      * @param string        $requestFile Relative or absolute path to filename.
      * @param Log           $log
+     * @param string        $delimiter
      * @param array         $headers
+     * @param string        $escapeCharacter
      */
     public function __construct(
         ConsoleOutput $consoleOutput,
         DirectoryList $directoryList,
         string $requestFile,
         Log $log,
         string $delimiter,
-        array $headers = []
+        array $headers = [],
+        string $escapeCharacter = ''
     ) {
         $this->consoleOutput = $consoleOutput;
         $this->directoryList = $directoryList;
@@ -96,7 +90,7 @@ public function getIterator()
         $requestFile = fopen($requestFile, 'r');
 
         $csvReader = \League\Csv\Reader::createFromStream($requestFile);
-        $csvReader->setEscape('');
+        $csvReader->setEscape($this->escapeCharacter);
         if (empty($this->headers)) {
             $csvReader->setHeaderOffset(0);
         }