nozavroni / csvelte

src/CSVelte/IO/Stream.php

Unused Use Statements -3 removed lines

@@ -16,14 +16,11 @@
 use CSVelte\Traits\IsReadable;
 use CSVelte\Traits\IsWritable;
 use CSVelte\Traits\IsSeekable;
-
 use CSVelte\Contract\Readable;
 use CSVelte\Contract\Writable;
 use CSVelte\Contract\Seekable;
 
 use \InvalidArgumentException;
-use CSVelte\Exception\NotYetImplementedException;
-use CSVelte\Exception\EndOfFileException;
 use CSVelte\Exception\IOException;
 
 /**

Spacing +4 added lines, -4 removed lines

@@ -144,7 +144,7 @@ 
             return self::streamize((string) $resource);
         }
 
-        throw new InvalidArgumentException('Invalid resource type: ' . $type);
+        throw new InvalidArgumentException('Invalid resource type: '.$type);
     }
 
     /**
@@ -231,17 +231,17 @@ 
                 $stream = @fopen($uri, $mode);
             } else {
                 if (!is_array($context)) {
-                    throw new InvalidArgumentException("Invalid argument for context. Expected array, got: " . gettype($context));
+                    throw new InvalidArgumentException("Invalid argument for context. Expected array, got: ".gettype($context));
                 }
                 $context = stream_context_create($context);
                 $stream = @fopen($uri, $mode, false, $context);
             }
             if (false === $stream) {
-                throw new IOException("Invalid stream URI: " . $uri, IOException::ERR_INVALID_STREAM_URI);
+                throw new IOException("Invalid stream URI: ".$uri, IOException::ERR_INVALID_STREAM_URI);
             }
         }
         if (!is_resource($stream) || get_resource_type($stream) != 'stream') {
-            throw new IOException("Expected stream resource, got: " . gettype($stream), IOException::ERR_INVALID_STREAM_RESOURCE);
+            throw new IOException("Expected stream resource, got: ".gettype($stream), IOException::ERR_INVALID_STREAM_RESOURCE);
         }
         return $stream;
     }

Braces +15 added lines, -5 removed lines

@@ -225,7 +225,9 @@ 
      */
     protected static function open($stream, $mode = null, $context = null)
     {
-        if (is_null($mode)) $mode = 'r+b';
+        if (is_null($mode)) {
+            $mode = 'r+b';
+        }
         if (is_string($uri = $stream)) {
             if (is_null($context)) {
                 $stream = @fopen($uri, $mode);
@@ -289,8 +291,12 @@ 
      */
     public function getMetaData($key = null)
     {
-        if (!$this->stream) return null;
-        if (is_null($key)) return $this->meta;
+        if (!$this->stream) {
+            return null;
+        }
+        if (is_null($key)) {
+            return $this->meta;
+        }
         return (array_key_exists($key, $this->meta)) ? $this->meta[$key] : null;
     }
 
@@ -388,7 +394,9 @@ 
      */
     public function getSize()
     {
-        if (!$this->stream) return null;
+        if (!$this->stream) {
+            return null;
+        }
         if (is_null($this->size)) {
             $stats = fstat($this->stream);
             if (array_key_exists('size', $stats)) {
@@ -422,7 +430,9 @@ 
     public function read($length)
     {
         $this->assertIsReadable();
-        if ($this->eof()) return false;
+        if ($this->eof()) {
+            return false;
+        }
         return fread($this->stream, $length);
     }
 

src/CSVelte/Writer.php

Doc Comments +5 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
      * likely buffer the output so that this may be called after writeRows()
      *
      * @param \Iterator|array A list of header values
-     * @return boolean
+     * @return boolean|null
      * @throws \CSVelte\Exception\WriterException
      */
     public function setHeaderRow($headers)
@@ -161,7 +161,7 @@ 
      * This means taking an array of data, and converting it to a Row object
      *
      * @param \Iterator|array of data items
-     * @return CSVelte\Table\AbstractRow
+     * @return Row
      * @access protected
      */
     protected function prepareRow(Iterator $row)
@@ -189,6 +189,9 @@ 
         return $this->quoteString($data);
     }
 
+    /**
+     * @param string $str
+     */
     protected function quoteString($str)
     {
         $flvr = $this->getFlavor();

Spacing +5 added lines, -5 removed lines

@@ -141,7 +141,7 @@ 
     {
         if (is_array($rows)) $rows = new ArrayIterator($rows);
         if (!($rows instanceof Iterator)) {
-            throw new InvalidArgumentException('First argument for ' . __METHOD__ . ' must be iterable');
+            throw new InvalidArgumentException('First argument for '.__METHOD__.' must be iterable');
         }
         $written = 0;
         if ($rows instanceof Reader) {
@@ -165,7 +165,7 @@ 
     {
         $items = array();
         foreach ($row as $data) {
-            $items []= $this->prepareData($data);
+            $items [] = $this->prepareData($data);
         }
         $row = new Row($items);
         return $row;
@@ -193,11 +193,11 @@ 
         // to use it for very long, in fact, once I finish writing the Data class
         // it is gonezo!
         $hasSpecialChars = function($s) use ($flvr) {
-            $specialChars = preg_quote($flvr->lineTerminator . $flvr->quoteChar . $flvr->delimiter);
+            $specialChars = preg_quote($flvr->lineTerminator.$flvr->quoteChar.$flvr->delimiter);
             $pattern = "/[{$specialChars}]/m";
             return preg_match($pattern, $s);
         };
-        switch($flvr->quoteStyle) {
+        switch ($flvr->quoteStyle) {
             case Flavor::QUOTE_ALL:
                 $doQuote = true;
                 break;
@@ -227,6 +227,6 @@ 
         $escapeQuote = "";
         if ($isQuoted) $escapeQuote = ($flvr->doubleQuote) ? $flvr->quoteChar : $flvr->escapeChar;
         // @todo Not sure what else, if anything, I'm supposed to be escaping here..
-        return str_replace($flvr->quoteChar, $escapeQuote . $flvr->quoteChar, $str);
+        return str_replace($flvr->quoteChar, $escapeQuote.$flvr->quoteChar, $str);
     }
 }

Braces +18 added lines, -6 removed lines

@@ -64,7 +64,9 @@ 
      */
     public function __construct(Writable $output, $flavor = null)
     {
-        if (!($flavor instanceof Flavor)) $flavor = new Flavor($flavor);
+        if (!($flavor instanceof Flavor)) {
+            $flavor = new Flavor($flavor);
+        }
         $this->flavor = $flavor;
         $this->output = $output;
     }
@@ -96,7 +98,9 @@ 
         if ($this->written) {
             throw new WriterException("Cannot set header row once data has already been written. ");
         }
-        if (is_array($headers)) $headers = new ArrayIterator($headers);
+        if (is_array($headers)) {
+            $headers = new ArrayIterator($headers);
+        }
         $this->headers = $headers;
     }
 
@@ -114,7 +118,9 @@ 
             $headerRow = new HeaderRow((array) $this->headers);
             $this->writeHeaderRow($headerRow);
         }
-        if (is_array($row)) $row = new ArrayIterator($row);
+        if (is_array($row)) {
+            $row = new ArrayIterator($row);
+        }
         $row = $this->prepareRow($row);
         if ($count = $this->output->writeLine($row->join($delim), $eol)) {
             $this->written++;
@@ -139,7 +145,9 @@ 
      */
     public function writeRows($rows)
     {
-        if (is_array($rows)) $rows = new ArrayIterator($rows);
+        if (is_array($rows)) {
+            $rows = new ArrayIterator($rows);
+        }
         if (!($rows instanceof Iterator)) {
             throw new InvalidArgumentException('First argument for ' . __METHOD__ . ' must be iterable');
         }
@@ -148,7 +156,9 @@ 
             $this->writeHeaderRow($rows->header());
         }
         foreach ($rows as $row) {
-            if ($this->writeRow($row)) $written++;
+            if ($this->writeRow($row)) {
+                $written++;
+            }
         }
         return $written;
     }
@@ -225,7 +235,9 @@ 
     {
         $flvr = $this->getFlavor();
         $escapeQuote = "";
-        if ($isQuoted) $escapeQuote = ($flvr->doubleQuote) ? $flvr->quoteChar : $flvr->escapeChar;
+        if ($isQuoted) {
+            $escapeQuote = ($flvr->doubleQuote) ? $flvr->quoteChar : $flvr->escapeChar;
+        }
         // @todo Not sure what else, if anything, I'm supposed to be escaping here..
         return str_replace($flvr->quoteChar, $escapeQuote . $flvr->quoteChar, $str);
     }

src/CSVelte/Taster.php

Doc Comments +6 added lines, -1 removed lines

@@ -165,6 +165,7 @@ 
      * replaceQuotedSpecialChars method which (at least to me) makes more sense.
      *
      * @param string The string to replace quoted strings within
+     * @param string $data
      * @return string The input string with quoted strings removed
      * @access protected
      * @todo Replace code that uses this method with the replaceQuotedSpecialChars
@@ -414,7 +415,7 @@ 
      * Determine whether a particular string of data has quotes around it.
      *
      * @param string The data to check
-     * @return boolean Whether the data is quoted or not
+     * @return integer Whether the data is quoted or not
      * @access protected
      */
     protected function isQuoted($data)
@@ -464,6 +465,8 @@ 
      *
      * @param string The string to do the replacements on
      * @param string The delimiter character to replace
+     * @param string $data
+     * @param string $delim
      * @return string The data with replacements performed
      * @access protected
      * @todo I could probably pass in (maybe optionally) the newline character I
@@ -490,6 +493,7 @@ 
      * to be practical.
      *
      * @param string The string of data to check the type of
+     * @param string $data
      * @return string One of the TYPE_ string constants above
      * @access protected
      * @uses \Carbon\Carbon date/time ilbrary/class
@@ -546,6 +550,7 @@ 
      * @param string $delim The CSV data's delimiting char (can be a variety of chars but)
      *     typically $eol is either a comma or a tab, sometimes a pipe)
      * @param string The CSV data's end-of-line char(s) (\n \r or \r\n)
+     * @param string $eol
      * @return boolean True if the data (most likely) contains a header row
      * @access public
      * @todo This method needs a total refactor. It's not necessary to loop twice

Indentation +14 added lines, -14 removed lines

@@ -261,20 +261,20 @@
         throw new TasterException("quoteChar and delimiter cannot be determined", TasterException::ERR_QUOTE_AND_DELIM);
     }
 
-     /**
-      * Take a list of likely delimiter characters and find the one that occurs
-      * the most consistent amount of times within the provided data.
-      *
-      * @param string The character(s) used for newlines
-      * @return string One of four Flavor::QUOTING_* constants
-      * @see \CSVelte\Flavor for possible quote style constants
-      * @access protected
-      * @todo Refactor this method--It needs more thorough testing against a wider
-      *     variety of CSV data to be sure it works reliably. And I'm sure there
-      *     are many performance and logic improvements that could be made. This
-      *     is essentially a first draft.
-      * @todo Use replaceQuotedSpecialChars rather than removeQuotedStrings
-      */
+        /**
+         * Take a list of likely delimiter characters and find the one that occurs
+         * the most consistent amount of times within the provided data.
+         *
+         * @param string The character(s) used for newlines
+         * @return string One of four Flavor::QUOTING_* constants
+         * @see \CSVelte\Flavor for possible quote style constants
+         * @access protected
+         * @todo Refactor this method--It needs more thorough testing against a wider
+         *     variety of CSV data to be sure it works reliably. And I'm sure there
+         *     are many performance and logic improvements that could be made. This
+         *     is essentially a first draft.
+         * @todo Use replaceQuotedSpecialChars rather than removeQuotedStrings
+         */
     protected function lickDelimiter($eol = "\n")
     {
         $delimiters = array(",", "\t", "|", ":", ";", "/", '\\');

Spacing +13 added lines, -13 removed lines

@@ -193,16 +193,16 @@ 
     {
         $str = $this->removeQuotedStrings($this->sample);
         $eols = [
-            self::EOL_WINDOWS => "\r\n",  // 0x0D - 0x0A - Windows, DOS OS/2
-            self::EOL_UNIX    => "\n",    // 0x0A -      - Unix, OSX
-            self::EOL_TRS80   => "\r",    // 0x0D -      - Apple ][, TRS80
+            self::EOL_WINDOWS => "\r\n", // 0x0D - 0x0A - Windows, DOS OS/2
+            self::EOL_UNIX    => "\n", // 0x0A -      - Unix, OSX
+            self::EOL_TRS80   => "\r", // 0x0D -      - Apple ][, TRS80
         ];
 
         $curCount = 0;
         // @todo This should return a default maybe?
         $curEol = PHP_EOL;
-        foreach($eols as $k => $eol) {
-            if( ($count = substr_count($str, $eol)) > $curCount) {
+        foreach ($eols as $k => $eol) {
+            if (($count = substr_count($str, $eol)) > $curCount) {
                 $curCount = $count;
                 $curEol = $eol;
             }
@@ -235,12 +235,12 @@ 
         $patterns = [];
         // delim can be anything but line breaks, quotes, alphanumeric, underscore, backslash, or any type of spaces
         $antidelims = implode(array("\r", "\n", "\w", preg_quote('"', '/'), preg_quote("'", '/')/*, preg_quote('\\', '/')*/, preg_quote(chr(self::SPACE), '/')));
-        $delim = '(?P<delim>[^' . $antidelims . '])';
+        $delim = '(?P<delim>[^'.$antidelims.'])';
         $quote = '(?P<quoteChar>"|\'|`)'; // @todo I think MS Excel uses some strange encoding for fancy open/close quotes
-        $patterns[] = '/' . $delim . ' ?' . $quote . '.*?\2\1/ms'; // ,"something", - anything but whitespace or quotes followed by a possible space followed by a quote followed by anything followed by same quote, followed by same anything but whitespace
-        $patterns[] = '/(?:^|\n)' . $quote . '.*?\1' . $delim . ' ?/ms'; // 'something', - beginning of line or line break, followed by quote followed by anything followed by quote followed by anything but whitespace or quotes
-        $patterns[] = '/' . $delim . ' ?' . $quote . '.*?\2(?:^|\n)/ms'; // ,'something' - anything but whitespace or quote followed by possible space followed by quote followed by anything followed by quote, followed by end of line
-        $patterns[] = '/(?:^|\n)' . $quote . '.*?\2(?:$|\n)/ms'; // 'something' - beginning of line followed by quote followed by anything followed by quote followed by same quote followed by end of line
+        $patterns[] = '/'.$delim.' ?'.$quote.'.*?\2\1/ms'; // ,"something", - anything but whitespace or quotes followed by a possible space followed by a quote followed by anything followed by same quote, followed by same anything but whitespace
+        $patterns[] = '/(?:^|\n)'.$quote.'.*?\1'.$delim.' ?/ms'; // 'something', - beginning of line or line break, followed by quote followed by anything followed by quote followed by anything but whitespace or quotes
+        $patterns[] = '/'.$delim.' ?'.$quote.'.*?\2(?:^|\n)/ms'; // ,'something' - anything but whitespace or quote followed by possible space followed by quote followed by anything followed by quote, followed by end of line
+        $patterns[] = '/(?:^|\n)'.$quote.'.*?\2(?:$|\n)/ms'; // 'something' - beginning of line followed by quote followed by anything followed by quote followed by same quote followed by end of line
         foreach ($patterns as $pattern) {
             // @todo I had to add the error suppression char here because it was
             //     causing undefined offset errors with certain data sets. strange...
@@ -385,7 +385,7 @@ 
             if (array_key_exists(self::DATA_NONNUMERIC, array_flip($types))) {
                 // allow for a SMALL amount of error here
                 $counts = array(self::DATA_SPECIAL => 0, self::DATA_NONNUMERIC => 0);
-                array_walk($freq['quoted'], function ($val) use (&$counts) {
+                array_walk($freq['quoted'], function($val) use (&$counts) {
                     $counts[$val]++;
                 });
                 arsort($counts);
@@ -511,7 +511,7 @@ 
                 $day = '[0-3]?[0-9]';
                 $sep = '[\/\.\-]?';
                 $time = '([0-2]?[0-9](:[0-5][0-9]){1,2}(am|pm)?|[01]?[0-9](am|pm))';
-                $date = '(' . $month . $sep . $day . $sep . $year . '|' . $day . $sep . $month . $sep . $year . '|' . $year . $sep . $month . $sep . $day . ')';
+                $date = '('.$month.$sep.$day.$sep.$year.'|'.$day.$sep.$month.$sep.$year.'|'.$year.$sep.$month.$sep.$day.')';
                 $dt = Carbon::parse($data);
                 if ($dt->today()) {
                     // then this is most likely a time string...
@@ -521,7 +521,7 @@ 
                 }
                 if (preg_match("/^{$date}$/i", $data)) {
                     return self::TYPE_DATE;
-                } elseif(preg_match("/^{$date} {$time}$/i")) {
+                } elseif (preg_match("/^{$date} {$time}$/i")) {
                     return self::TYPE_DATETIME;
                 }
             } catch (\Exception $e) {

Braces +36 added lines, -13 removed lines

@@ -145,7 +145,9 @@ 
         try {
             list($quoteChar, $delimiter) = $this->lickQuoteAndDelim();
         } catch (TasterException $e) {
-            if ($e->getCode() !== TasterException::ERR_QUOTE_AND_DELIM) throw $e;
+            if ($e->getCode() !== TasterException::ERR_QUOTE_AND_DELIM) {
+                throw $e;
+            }
             $quoteChar = '"';
             $delimiter = $this->lickDelimiter($lineTerminator);
         }
@@ -244,7 +246,9 @@ 
         foreach ($patterns as $pattern) {
             // @todo I had to add the error suppression char here because it was
             //     causing undefined offset errors with certain data sets. strange...
-            if (@preg_match_all($pattern, $this->sample, $matches) && $matches) break;
+            if (@preg_match_all($pattern, $this->sample, $matches) && $matches) {
+                break;
+            }
         }
         if ($matches) {
             $quotes = array_count_values($matches['quoteChar']);
@@ -283,7 +287,9 @@ 
         $charFrequency = array();
         while ($start < count($lines)) {
             foreach ($lines as $key => $line) {
-                if (!trim($line)) continue;
+                if (!trim($line)) {
+                    continue;
+                }
                 foreach ($delimiters as $char) {
                     $freq = substr_count($line, $char);
                     $charFrequency[$char][$key] = $freq;
@@ -376,11 +382,18 @@ 
         }
         $types = array_unique($freq['quoted']);
         // if quoting_styles still has QUOTE_ALL or QUOTE_NONE, then that's the one to return
-        if (array_key_exists(Flavor::QUOTE_ALL, $quoting_styles)) return Flavor::QUOTE_ALL;
-        if (array_key_exists(Flavor::QUOTE_NONE, $quoting_styles)) return Flavor::QUOTE_NONE;
+        if (array_key_exists(Flavor::QUOTE_ALL, $quoting_styles)) {
+            return Flavor::QUOTE_ALL;
+        }
+        if (array_key_exists(Flavor::QUOTE_NONE, $quoting_styles)) {
+            return Flavor::QUOTE_NONE;
+        }
         if (count($types) == 1) {
-            if (current($types) == self::DATA_SPECIAL) return Flavor::QUOTE_MINIMAL;
-            elseif (current($types) == self::DATA_NONNUMERIC) return Flavor::QUOTE_NONNUMERIC;
+            if (current($types) == self::DATA_SPECIAL) {
+                return Flavor::QUOTE_MINIMAL;
+            } elseif (current($types) == self::DATA_NONNUMERIC) {
+                return Flavor::QUOTE_NONNUMERIC;
+            }
         } else {
             if (array_key_exists(self::DATA_NONNUMERIC, array_flip($types))) {
                 // allow for a SMALL amount of error here
@@ -392,7 +405,9 @@ 
                 $most = current($counts);
                 $least = end($counts);
                 $err_margin = $least / $most;
-                if ($err_margin < 1) return Flavor::QUOTE_NONNUMERIC;
+                if ($err_margin < 1) {
+                    return Flavor::QUOTE_NONNUMERIC;
+                }
             }
         }
         return Flavor::QUOTE_MINIMAL;
@@ -583,15 +598,23 @@ 
         foreach ($types as $line_no => $cols) {
             foreach ($cols as $col_no => $col_info) {
                 extract($col_info);
-                if (!array_key_exists($col_no, $potential_header)) continue;
+                if (!array_key_exists($col_no, $potential_header)) {
+                    continue;
+                }
                 extract($potential_header[$col_no], EXTR_PREFIX_ALL, "header");
                 if ($header_type == self::TYPE_STRING) {
                     // use length
-                    if ($length != $header_length) $hasHeader++;
-                    else $hasHeader--;
+                    if ($length != $header_length) {
+                        $hasHeader++;
+                    } else {
+                        $hasHeader--;
+                    }
                 } else {
-                    if ($type != $header_type) $hasHeader++;
-                    else $hasHeader--;
+                    if ($type != $header_type) {
+                        $hasHeader++;
+                    } else {
+                        $hasHeader--;
+                    }
                 }
             }
         }

src/CSVelte/Reader.php

Doc Comments +7 added lines, -3 removed lines

@@ -127,7 +127,7 @@ 
      * accept any string (or any object with a __toString() method), or an
      * SplFileObject, so long as it represents a file rather than a directory. 
      *
-     * @param \CSVelte\Contract\Readable|object|string|SplFileObject $input See description
+     * @param Readable $input See description
      * @return $this
      */
     protected function setSource($input)
@@ -328,6 +328,9 @@ 
      * @todo This actually shouldn't even be necessary. Characters should be read
      *     in one at a time and a quote that follows another should just be ignored
      *     deeming this unnecessary.
+     * @param string $str
+     * @param string $esc
+     * @param string $quo
      */
     protected function unEscape($str, $esc, $quo)
     {
@@ -338,6 +341,7 @@ 
      * Parse a line of CSV data into an array of columns
      *
      * @param string A line of CSV data to parse
+     * @param string $line
      * @return array An array of columns
      * @access protected
      * @internal
@@ -417,7 +421,7 @@ 
     /**
      * Retrieve header row.
      *
-     * @return CSVelte\Table\HeaderRow|null The header row if there is one
+     * @return HeaderRow The header row if there is one
      */
     public function header()
     {
@@ -458,7 +462,7 @@ 
     /**
      * Returns an iterator with rows from user-supplied filter functions removed
      *
-     * @return CSVelte\Reader\FilteredReader An iterator with filtered rows
+     * @return FilteredReader An iterator with filtered rows
      */
     public function filter()
     {

Indentation +2 added lines, -2 removed lines

@@ -91,8 +91,8 @@
     public function __construct($input, $flavor = null)
     {
         $this->setSource($input)
-             ->setFlavor($flavor)
-             ->rewind();
+                ->setFlavor($flavor)
+                ->rewind();
     }
 
     /**

Spacing +4 added lines, -4 removed lines

@@ -185,7 +185,7 @@ 
             do {
                 if (!isset($lines)) $lines = array();
                 if (false === ($line = $this->source->readLine($eol))) {
-                    throw new EndOfFileException("End of file reached: " . $this->source->getName());
+                    throw new EndOfFileException("End of file reached: ".$this->source->getName());
                 }
                 array_push($lines, rtrim($line, $eol));
             } while ($this->inQuotedString(end($lines), $f->quoteChar, $f->escapeChar));
@@ -279,7 +279,7 @@ 
      */
     protected function replaceQuotedSpecialChars($data, $delim, $quo, $eol)
     {
-        return preg_replace_callback('/(['. preg_quote($quo, '/') . '])(.*)\1/imsU', function($matches) use ($delim, $eol) {
+        return preg_replace_callback('/(['.preg_quote($quo, '/').'])(.*)\1/imsU', function($matches) use ($delim, $eol) {
             $ret = str_replace($eol, self::PLACEHOLDER_NEWLINE, $matches[0]);
             $ret = str_replace($delim, self::PLACEHOLDER_DELIM, $ret);
             return $ret;
@@ -331,7 +331,7 @@ 
      */
     protected function unEscape($str, $esc, $quo)
     {
-        return str_replace($esc . $quo, $quo, $str);
+        return str_replace($esc.$quo, $quo, $str);
     }
 
     /**
@@ -472,7 +472,7 @@ 
      */
     public function toArray()
     {
-        return array_map(function($row){
+        return array_map(function($row) {
             return $row->toArray();
         }, iterator_to_array($this));
     }

Braces +18 added lines, -6 removed lines

@@ -104,7 +104,9 @@ 
      */
     protected function setFlavor($flavor = null)
     {
-        if (is_array($flavor)) $flavor = new Flavor($flavor);
+        if (is_array($flavor)) {
+            $flavor = new Flavor($flavor);
+        }
         $taster = new Taster($this->source);
         // @todo put this inside a try/catch
         if (is_null($flavor)) {
@@ -159,7 +161,9 @@ 
                     $this->header = new HeaderRow($parsed);
                 } else {
                     $this->current = new Row($parsed);
-                    if ($this->header) $this->current->setHeaderRow($this->header);
+                    if ($this->header) {
+                        $this->current->setHeaderRow($this->header);
+                    }
                 }
             } catch (EndOfFileException $e) {
                 $this->current = false;
@@ -183,7 +187,9 @@ 
         $eol = $f->lineTerminator;
         try {
             do {
-                if (!isset($lines)) $lines = array();
+                if (!isset($lines)) {
+                    $lines = array();
+                }
                 if (false === ($line = $this->source->readLine($eol))) {
                     throw new EndOfFileException("End of file reached: " . $this->source->getName());
                 }
@@ -191,7 +197,9 @@ 
             } while ($this->inQuotedString(end($lines), $f->quoteChar, $f->escapeChar));
         } catch (EndOfFileException $e) {
             // only throw the exception if we don't already have lines in the buffer
-            if (!count($lines)) throw $e;
+            if (!count($lines)) {
+                throw $e;
+            }
         }
         return rtrim(implode($eol, $lines), $eol);
     }
@@ -211,14 +219,18 @@ 
     {
         if (!empty($line)) {
             do {
-                if (!isset($i)) $i = 0;
+                if (!isset($i)) {
+                    $i = 0;
+                }
                 $c = $line[$i++];
                 if ($this->escape) {
                     $this->escape = false;
                     continue;
                 }
                 $this->escape = ($c == $escapeChar);
-                if ($c == $quoteChar) $this->open = !$this->open;
+                if ($c == $quoteChar) {
+                    $this->open = !$this->open;
+                }
             } while ($i < strlen($line));
         }
         return $this->open;

src/CSVelte/Reader/FilteredIterator.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 
     public function toArray()
     {
-        return array_map(function($row){
+        return array_map(function($row) {
             return $row->toArray();
         }, iterator_to_array($this));
     }

src/CSVelte/Flavor.php

Spacing +2 added lines, -2 removed lines

@@ -192,7 +192,7 @@ 
     protected function assertValidAttribute($attr)
     {
         if (!property_exists(self::class, $attr))
-            throw new InvalidArgumentException("Unknown attribute: " . $attr);
+            throw new InvalidArgumentException("Unknown attribute: ".$attr);
     }
 
     /**
@@ -241,7 +241,7 @@ 
      */
     public function __set($attr, $val)
     {
-        throw new ImmutableException("Cannot change attributes on an immutable object: " . self::class . "::\$" . $attr);
+        throw new ImmutableException("Cannot change attributes on an immutable object: ".self::class."::\$".$attr);
     }
 
     public function toArray()

Braces +3 added lines, -2 removed lines

@@ -191,8 +191,9 @@
      */
     protected function assertValidAttribute($attr)
     {
-        if (!property_exists(self::class, $attr))
-            throw new InvalidArgumentException("Unknown attribute: " . $attr);
+        if (!property_exists(self::class, $attr)) {
+                    throw new InvalidArgumentException("Unknown attribute: " . $attr);
+        }
     }
 
     /**

src/CSVelte/Table/AbstractRow.php

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     public function __construct($fields)
     {
         $this->setFields($fields)
-             ->rewind();
+                ->rewind();
     }
 
     protected function setFields($fields)

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
             } elseif ($fields instanceof Iterator) {
                 $fields = iterator_to_array($fields);
             } else {
-                throw new InvalidArgumentException(__CLASS__ . " requires an array, got: " . gettype($fields));
+                throw new InvalidArgumentException(__CLASS__." requires an array, got: ".gettype($fields));
             }
         }
         $this->fields = array_values($fields);
@@ -249,7 +249,7 @@ 
     protected function assertOffsetExists($offset)
     {
         if (!$this->offsetExists($offset)) {
-            throw new OutOfBoundsException("Undefined offset: " . $offset);
+            throw new OutOfBoundsException("Undefined offset: ".$offset);
         }
     }
 

Braces +6 added lines, -2 removed lines

@@ -151,7 +151,9 @@ 
     public function next()
     {
         $this->position++;
-        if ($this->valid()) return $this->current();
+        if ($this->valid()) {
+            return $this->current();
+        }
     }
 
     /**
@@ -163,7 +165,9 @@ 
     public function rewind()
     {
         $this->position = 0;
-        if ($this->valid()) return $this->current();
+        if ($this->valid()) {
+            return $this->current();
+        }
     }
 
     /**

src/CSVelte/Traits/IsWritable.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function writeLine($line, $eol = PHP_EOL)
     {
-        return $this->write($line . $eol);
+        return $this->write($line.$eol);
     }
 
     /**
@@ -52,7 +52,7 @@ 
     protected function assertIsWritable()
     {
         if (!$this->isWritable()) {
-            throw new IOException("Stream not writable: " . $this->getName(), IOException::ERR_NOT_WRITABLE);
+            throw new IOException("Stream not writable: ".$this->getName(), IOException::ERR_NOT_WRITABLE);
         }
     }
 

src/CSVelte/Traits/IsReadable.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
     protected function assertIsReadable()
     {
         if (!$this->isReadable()) {
-            throw new IOException("Stream not readable: " . $this->getName(), IOException::ERR_NOT_READABLE);
+            throw new IOException("Stream not readable: ".$this->getName(), IOException::ERR_NOT_READABLE);
         }
     }
 

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
     {
         $size = 0;
         $buffer = false;
-        if (!is_array($eol)) $eol = array($eol);
+        if (!is_array($eol)) {
+            $eol = array($eol);
+        }
         while (!$this->eof()) {
             // Using a loose equality here to match on '' and false.
             if (null == ($byte = $this->read(1))) {