Merge pull request #42 from keboola/webrouse-COM-350-fix-readline-speed

Validate line breaks only once - in constructor

Author: michaljurecko

src/CsvReader.php

@@ -53,7 +53,10 @@ public function __construct(
         $this->options = new CsvOptions($delimiter, $enclosure, $escapedBy);
         $this->setSkipLines($skipLines);
         $this->setFile($file);
+
         $this->lineBreak = $this->detectLineBreak();
+        $this->validateLineBreak();
+
         rewind($this->filePointer);
         $this->header = $this->readLine();
         $this->rewind();
@@ -124,8 +127,6 @@ protected function detectLineBreak()
      */
     protected function readLine()
     {
-        $this->validateLineBreak();
-
         // allow empty enclosure hack
         $enclosure = !$this->getEnclosure() ? chr(0) : $this->getEnclosure();
         $escapedBy = !$this->getEscapedBy() ? chr(0) : $this->getEscapedBy();
@@ -138,15 +139,7 @@ protected function readLine()
      */
     protected function validateLineBreak()
     {
-        try {
-            $lineBreak = $this->getLineBreak();
-        } catch (Exception $e) {
-            throw new InvalidArgumentException(
-                "Failed to detect line break: " . $e->getMessage(),
-                Exception::INVALID_PARAM,
-                $e
-            );
-        }
+        $lineBreak = $this->getLineBreak();
         if (in_array($lineBreak, ["\r\n", "\n"])) {
             return $lineBreak;
         }