nozavroni / csvelte

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 +1 added lines, -1 removed lines

@@ -242,7 +242,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 = collect(array_values($fields));

src/CSVelte/Reader.php

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();
     }
 
     /**

Doc Comments +1 added lines, -1 removed lines

@@ -329,7 +329,7 @@
      * @param string $str The string to unescape
      * @param string $esc The escape character used
      * @param string $quo The quote character used
-     * @return mixed The string with characters unescaped
+     * @return string The string with characters unescaped
      * @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.

Unused Use Statements -2 removed lines

@@ -14,11 +14,9 @@
 namespace CSVelte;
 
 use CSVelte\Contract\Streamable;
-
 use CSVelte\Table\Row;
 use CSVelte\Table\HeaderRow;
 use CSVelte\Reader\FilteredIterator as FilteredReader;
-
 use CSVelte\Exception\EndOfFileException;
 
 use function

Spacing +7 added lines, -7 removed lines

@@ -254,7 +254,7 @@ 
      */
     public function toArray()
     {
-        return array_map(function ($row) {
+        return array_map(function($row) {
             return $row->toArray();
         }, iterator_to_array($this));
     }
@@ -387,12 +387,12 @@ 
                 if (!isset($i)) {
                     $i = 0;
                 }
-                $c                 = $line[$i++];
+                $c = $line[$i++];
                 if ($this->escape) {
                     $this->escape = false;
                     continue;
                 }
-                $this->escape                     = ($c == $escapeChar);
+                $this->escape = ($c == $escapeChar);
                 if ($c == $quoteChar) {
                     $this->open = !$this->open;
                 }
@@ -428,7 +428,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);
 
@@ -453,7 +453,7 @@ 
     protected function undoReplaceQuotedSpecialChars($data, $delim, $eol)
     {
         $replacements = [self::PLACEHOLDER_DELIM => $delim, self::PLACEHOLDER_NEWLINE => $eol];
-        if (array_walk($replacements, function ($replacement, $placeholder) use (&$data) {
+        if (array_walk($replacements, function($replacement, $placeholder) use (&$data) {
             $data = str_replace($placeholder, $replacement, $data);
         })) {
             return $data;
@@ -497,7 +497,7 @@ 
      */
     protected function unEscape($str, $esc, $quo)
     {
-        return str_replace($esc . $quo, $quo, $str);
+        return str_replace($esc.$quo, $quo, $str);
     }
 
     /**
@@ -516,7 +516,7 @@ 
         $columns  = explode($f->delimiter, $replaced);
         $that     = $this;
 
-        return array_map(function ($val) use ($that, $f) {
+        return array_map(function($val) use ($that, $f) {
             $undone = $that->undoReplaceQuotedSpecialChars($val, $f->delimiter, $f->lineTerminator);
 
             return $this->unQuote($undone);

src/CSVelte/CSVelte.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
     {
         self::assertFileExists($filename);
         if (!is_readable($filename)) {
-            throw new IOException('Permission denied for: ' . $filename, IOException::ERR_FILE_PERMISSION_DENIED);
+            throw new IOException('Permission denied for: '.$filename, IOException::ERR_FILE_PERMISSION_DENIED);
         }
     }
 
@@ -137,7 +137,7 @@ 
     protected static function assertFileExists($filename)
     {
         if (!file_exists($filename)) {
-            throw new IOException('File does not exist: ' . $filename, IOException::ERR_FILE_NOT_FOUND);
+            throw new IOException('File does not exist: '.$filename, IOException::ERR_FILE_NOT_FOUND);
         }
     }
 }

src/CSVelte/Exception/HeaderException.php

Indentation -1 removed lines

@@ -19,7 +19,6 @@
 if (if $file->hasHeader()) {
     $header = $file->getHeader()
 }
-
  * you can instead simply call $header->getHeader() and handle this exception if
  * said file has no header
  *

src/CSVelte/Traits/IsWritable.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      */
     public function writeLine($line, $eol = PHP_EOL)
     {
-        return $this->write($line . $eol);
+        return $this->write($line.$eol);
     }
 
     /**

src/CSVelte/Collection/AbstractCollection.php

Doc Comments +3 added lines, -3 removed lines

@@ -440,7 +440,7 @@ 
      * Returns a new collection with $items added.
      *
      * @param array $items Any number of arguments will be pushed onto the
-     * @return mixed The first item in this collection
+     * @return Collection The first item in this collection
      */
     public function push(...$items)
     {
@@ -453,7 +453,7 @@ 
      *
      * Returns a new collection with $items added.
      *
-     * @return mixed The first item in this collection
+     * @return Collection The first item in this collection
      */
     public function unshift(...$items)
     {
@@ -592,7 +592,7 @@ 
     /**
      * Returns collection in reverse order.
      *
-     * @param null $preserveKeys True if you want to preserve collection's keys
+     * @param boolean $preserveKeys True if you want to preserve collection's keys
      * @return Collection This collection in reverse order.
      */
     public function reverse($preserveKeys = null)

Spacing +10 added lines, -10 removed lines

@@ -163,7 +163,7 @@ 
      *
      * @return mixed
      */
-    public function current ()
+    public function current()
     {
         return current($this->data);
     }
@@ -175,7 +175,7 @@ 
      *
      * @return mixed
      */
-    public function key ()
+    public function key()
     {
         return key($this->data);
     }
@@ -189,7 +189,7 @@ 
      *
      * @return mixed
      */
-    public function next ()
+    public function next()
     {
         $next = next($this->data);
         $key = key($this->data);
@@ -208,7 +208,7 @@ 
      *
      * @return mixed
      */
-    public function rewind ()
+    public function rewind()
     {
         $this->isValid = true;
         return reset($this->data);
@@ -221,7 +221,7 @@ 
      *
      * @return bool True if internal pointer isn't past the end
      */
-    public function valid ()
+    public function valid()
     {
         return $this->isValid;
     }
@@ -280,7 +280,7 @@ 
             return $this->data[$index];
         }
         if ($throw) {
-            throw new OutOfBoundsException(__CLASS__ . " could not find value at index " . $index);
+            throw new OutOfBoundsException(__CLASS__." could not find value at index ".$index);
         }
         return $default;
     }
@@ -317,7 +317,7 @@ 
             unset($this->data[$index]);
         } else {
             if ($throw) {
-                throw new OutOfBoundsException('No value found at given index: ' . $index);
+                throw new OutOfBoundsException('No value found at given index: '.$index);
             }
         }
 
@@ -516,7 +516,7 @@ 
     public function pairs()
     {
         return static::factory(array_map(
-            function ($key, $val) {
+            function($key, $val) {
                 return [$key, $val];
             },
             array_keys($this->data),
@@ -661,7 +661,7 @@ 
     protected function assertCorrectInputDataType($data)
     {
         if (!$this->isConsistentDataStructure($data)) {
-            throw new InvalidArgumentException(__CLASS__ . ' expected traversable data, got: ' . gettype ($data));
+            throw new InvalidArgumentException(__CLASS__.' expected traversable data, got: '.gettype($data));
         }
     }
 
@@ -705,7 +705,7 @@ 
                 }
             }
             // if row contains an array it isn't tabular
-            if (array_reduce($row, function($carry, $item){
+            if (array_reduce($row, function($carry, $item) {
                 return is_array($item) && $carry;
             }, true)) {
                 return false;

src/CSVelte/functions.php

Unused Use Statements -2 removed lines

@@ -25,9 +25,7 @@
 use CSVelte\IO\IteratorStream;
 use CSVelte\IO\Stream;
 use CSVelte\IO\StreamResource;
-use CSVelte\Collection\AbstractCollection;
 use InvalidArgumentException;
-
 use Iterator;
 
 /**

src/CSVelte/Taster.php

Doc Comments +1 added lines, -1 removed lines

@@ -692,7 +692,7 @@
      *
      * @param string $data The data to check
      *
-     * @return bool Whether the data is quoted or not
+     * @return integer Whether the data is quoted or not
      */
     protected function isQuoted($data)
     {

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use CSVelte\Contract\Readable;
 use CSVelte\Contract\Writable;
 use CSVelte\Contract\Seekable;
-
 use CSVelte\Exception\NotYetImplementedException;
 
 /**

Indentation +14 added lines, -14 removed lines

@@ -484,22 +484,22 @@ 
             // at least the same general area. Use the delimiter that is the most
             // consistent in that way...
 
-             /**
-              * @todo Add a method here to figure out where duplicate best-match
-              *     delimiter(s) fall within each line and then, depending on
-              *     which one has the best distribution, return that one.
-              */
-             $decision = $dups->get($max);
+                /**
+                 * @todo Add a method here to figure out where duplicate best-match
+                 *     delimiter(s) fall within each line and then, depending on
+                 *     which one has the best distribution, return that one.
+                 */
+                $decision = $dups->get($max);
             try {
                 return $this->guessDelimByDistribution($decision, $eol);
             } catch (TasterException $e) {
                 // if somehow we STILL can't come to a consensus, then fall back to a
-                 // "preferred delimiters" list...
-                 foreach ($this->delims as $key => $val) {
-                     if ($delim = array_search($val, $decision)) {
-                         return $delim;
-                     }
-                 }
+                    // "preferred delimiters" list...
+                    foreach ($this->delims as $key => $val) {
+                        if ($delim = array_search($val, $decision)) {
+                            return $delim;
+                        }
+                    }
             }
         }
 
@@ -568,8 +568,8 @@ 
             })->map(function ($dists) {
                 return $dists->average();
             })->sort()
-              ->reverse()
-              ->getKeyAtPosition(0)];
+                ->reverse()
+                ->getKeyAtPosition(0)];
         } catch (Exception $e) {
             throw new TasterException('delimiter cannot be determined by distribution', TasterException::ERR_DELIMITER);
         }

Spacing +30 added lines, -30 removed lines

@@ -223,9 +223,9 @@ 
     public function lickHeader($delim, $eol)
     {
         $types      = collect();
-        $buildTypes = function ($line, $line_no) use (&$types, $delim, $eol) {
+        $buildTypes = function($line, $line_no) use (&$types, $delim, $eol) {
             $line    = str_replace(self::PLACEHOLDER_NEWLINE, $eol, $line);
-            $getType = function ($field, $colpos) use (&$types, $line, $line_no, $delim) {
+            $getType = function($field, $colpos) use (&$types, $line, $line_no, $delim) {
                 $field = str_replace(self::PLACEHOLDER_DELIM, $delim, $field);
                 // @todo Need a Collection::setTableField($x, $y) method
                 //       See notes in green binder about refactoring Collection
@@ -247,8 +247,8 @@ 
 
         $hasHeader      = 0;
         $possibleHeader = $types->shift();
-        $types->walk(function ($row) use (&$hasHeader, $possibleHeader) {
-            $row->walk(function ($field_info, $col_no) use (&$hasHeader, $possibleHeader) {
+        $types->walk(function($row) use (&$hasHeader, $possibleHeader) {
+            $row->walk(function($field_info, $col_no) use (&$hasHeader, $possibleHeader) {
                 extract($field_info);
                 try {
                     $col = $possibleHeader->get($col_no, null, true);
@@ -314,9 +314,9 @@ 
     {
         $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;
@@ -359,12 +359,12 @@ 
         $patterns = [];
         // delim can be anything but line breaks, quotes, alphanumeric, underscore, backslash, or any type of spaces
         $antidelims = implode(["\r", "\n", "\w", 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...
@@ -422,24 +422,24 @@ 
         // each frequency (in 10 lines, "tab" occurred 5 times on 7 of those
         // lines, 6 times on 2 lines, and 7 times on 1 line)
         collect(explode($eol, $this->removeQuotedStrings($this->sample)))
-            ->walk(function ($line, $line_no) use (&$frequencies) {
+            ->walk(function($line, $line_no) use (&$frequencies) {
                 collect(str_split($line))
-                    ->filter(function ($c) {
+                    ->filter(function($c) {
                         return collect($this->delims)->contains($c);
                     })
                     ->frequency()
                     ->sort()
                     ->reverse()
-                    ->walk(function ($count, $char) use (&$frequencies, $line_no) {
+                    ->walk(function($count, $char) use (&$frequencies, $line_no) {
                         $frequencies[$char][$line_no] = $count;
                     });
             })
             // the above only finds frequencies for characters if they exist in
             // a given line. This will go back and fill in zeroes where a char
             // didn't occur at all in a given line (needed to determine mode)
-            ->walk(function ($line, $line_no) use (&$frequencies) {
+            ->walk(function($line, $line_no) use (&$frequencies) {
                 collect($frequencies)
-                    ->walk(function ($counts, $char) use ($line_no, &$frequencies) {
+                    ->walk(function($counts, $char) use ($line_no, &$frequencies) {
                         if (!isset($frequencies[$char][$line_no])) {
                             $frequencies[$char][$line_no] = 0;
                         }
@@ -450,8 +450,8 @@ 
         // of times a char (possible delim) will occur on each line...
         $freqs = collect($frequencies);
         $modes = $freqs->mode();
-        $freqs->walk(function ($f, $chr) use ($modes, &$consistencies) {
-            collect($f)->walk(function ($num) use ($modes, $chr, &$consistencies) {
+        $freqs->walk(function($f, $chr) use ($modes, &$consistencies) {
+            collect($f)->walk(function($num) use ($modes, $chr, &$consistencies) {
                 if ($expected = $modes->get($chr)) {
                     if ($num == $expected) {
                         // met the goal, yay!
@@ -544,19 +544,19 @@ 
             // @todo Write a method that does this...
             $lines = collect(explode($eol, $this->removeQuotedStrings($this->sample)));
 
-            return $delims[collect($delims)->map(function ($delim) use (&$distrib, $lines) {
+            return $delims[collect($delims)->map(function($delim) use (&$distrib, $lines) {
                 $linedist = collect();
-                $lines->walk(function ($line, $line_no) use (&$linedist, $delim) {
+                $lines->walk(function($line, $line_no) use (&$linedist, $delim) {
                     if (!strlen($line)) {
                         return;
                     }
                     $sectstot = 10;
                     $sectlen = (int) (strlen($line) / $sectstot);
                     $sections = collect(str_split($line, $sectlen))
-                        ->map(function ($section) use ($delim) {
+                        ->map(function($section) use ($delim) {
                             return substr_count($section, $delim);
                         })
-                        ->filter(function ($count) {
+                        ->filter(function($count) {
                             return (bool) $count;
                         });
                     if (is_numeric($count = $sections->count())) {
@@ -565,7 +565,7 @@ 
                 });
 
                 return $linedist;
-            })->map(function ($dists) {
+            })->map(function($dists) {
                 return $dists->average();
             })->sort()
               ->reverse()
@@ -615,9 +615,9 @@ 
 
         // walk through each line from the data sample to determine which fields
         // are quoted and which aren't
-        $qsFunc = function ($line) use (&$quoting_styles, &$freq, $eol, $delim) {
+        $qsFunc = function($line) use (&$quoting_styles, &$freq, $eol, $delim) {
             $line     = str_replace(self::PLACEHOLDER_NEWLINE, $eol, $line);
-            $qnqaFunc = function ($field) use (&$quoting_styles, &$freq, $delim) {
+            $qnqaFunc = function($field) use (&$quoting_styles, &$freq, $delim) {
                 $field = str_replace(self::PLACEHOLDER_DELIM, $delim, $field);
                 if ($this->isQuoted($field)) {
                     $field = $this->unQuote($field);
@@ -638,7 +638,7 @@ 
         $lines->walk($qsFunc->bindTo($this));
 
         $types          = $freq->get('quoted')->unique();
-        $quoting_styles = $quoting_styles->filter(function ($val) {
+        $quoting_styles = $quoting_styles->filter(function($val) {
             return (bool) $val;
         });
         // if quoting_styles still has QUOTE_ALL or QUOTE_NONE, then return
@@ -658,7 +658,7 @@ 
             if ($types->contains(self::DATA_NONNUMERIC)) {
                 // allow for a SMALL amount of error here
                 $counts = collect([self::DATA_SPECIAL => 0, self::DATA_NONNUMERIC => 0]);
-                $freq->get('quoted')->walk(function ($type) use (&$counts) {
+                $freq->get('quoted')->walk(function($type) use (&$counts) {
                     $counts->increment($type);
                 });
                 // @todo is all this even necessary? seems unnecessary to me...
@@ -751,7 +751,7 @@ 
      */
     protected function replaceQuotedSpecialChars($data, $delim)
     {
-        return preg_replace_callback('/([\'"])(.*)\1/imsU', function ($matches) use ($delim) {
+        return preg_replace_callback('/([\'"])(.*)\1/imsU', function($matches) use ($delim) {
             $ret = preg_replace("/([\r\n])/", self::PLACEHOLDER_NEWLINE, $matches[0]);
             $ret = str_replace($delim, self::PLACEHOLDER_DELIM, $ret);
 
@@ -791,7 +791,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    = new DateTime($data);
             $dt->setTime(0, 0, 0);
             $now = new DateTime();

src/CSVelte/Autoloader.php

Spacing +3 added lines, -3 removed lines

@@ -70,11 +70,11 @@ 
             if (in_array($rp, $paths)) {
                 return true;
             }
-            $this->paths []= $rp;
+            $this->paths [] = $rp;
 
             return true;
         }
-        $this->paths []= $path;
+        $this->paths [] = $path;
 
         return false;
     }
@@ -132,7 +132,7 @@ 
         $fqcp  = str_replace(self::NAMESPACE_SEPARATOR, DIRECTORY_SEPARATOR, $className);
         $paths = $this->getPaths();
         foreach ($paths as $path) {
-            $classPath = $path . DIRECTORY_SEPARATOR . $fqcp . '.php';
+            $classPath = $path.DIRECTORY_SEPARATOR.$fqcp.'.php';
             if (file_exists($classPath) && is_readable($classPath)) {
                 require_once($classPath);