nozavroni / csvelte

src/CSVelte/Reader/FilteredIterator.php

Spacing +1 added lines, -1 removed lines

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

src/CSVelte/IO/StreamResource.php

Spacing +4 added lines, -4 removed lines

@@ -244,7 +244,7 @@ 
     {
         if (!$this->isConnected()) {
             $e          = null;
-            $errhandler = function () use (&$e) {
+            $errhandler = function() use (&$e) {
                 $e = new IOException(sprintf(
                     'Could not open connection for %s using mode %s',
                     $this->getUri(),
@@ -543,7 +543,7 @@ 
 
             return $this;
         }
-        throw new InvalidArgumentException('Context options must be an array, got: ' . gettype($options));
+        throw new InvalidArgumentException('Context options must be an array, got: '.gettype($options));
     }
 
     /**
@@ -567,7 +567,7 @@ 
 
             return $this;
         }
-        throw new InvalidArgumentException('Context parameters must be an array, got: ' . gettype($params));
+        throw new InvalidArgumentException('Context parameters must be an array, got: '.gettype($params));
     }
 
     /**
@@ -896,7 +896,7 @@ 
         if (is_null($lazy)) {
             $lazy = true;
         }
-        $this->lazy               = (bool) $lazy;
+        $this->lazy = (bool) $lazy;
 
         return $this;
     }

src/CSVelte/IO/BufferStream.php

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
         $top          = substr($this->buffer, 0, $start);
         $data         = substr($this->buffer, $start, $length);
         $bottom       = substr($this->buffer, $start + $length);
-        $this->buffer = $top . $bottom;
+        $this->buffer = $top.$bottom;
 
         return $data;
     }

src/CSVelte/Collection.php

Spacing +13 added lines, -13 removed lines

@@ -370,7 +370,7 @@ 
             }
             $i++;
         }
-        throw new OutOfBoundsException('Collection data does not contain a key at given position: ' . $pos);
+        throw new OutOfBoundsException('Collection data does not contain a key at given position: '.$pos);
     }
 
     /**
@@ -575,7 +575,7 @@ 
             return $this->data[$key];
         }
         if ($throwExc) {
-            throw new OutOfBoundsException('Collection data does not contain value for given key: ' . $key);
+            throw new OutOfBoundsException('Collection data does not contain value for given key: '.$key);
         }
         
         return $default;
@@ -928,11 +928,11 @@ 
     public function duplicates()
     {
         $dups = [];
-        $this->walk(function ($val, $key) use (&$dups) {
+        $this->walk(function($val, $key) use (&$dups) {
             $dups[$val][] = $key;
         });
 
-        return (new self($dups))->filter(function ($val) {
+        return (new self($dups))->filter(function($val) {
             return count($val) > 1;
         });
     }
@@ -962,7 +962,7 @@ 
     public function pairs($alt = false)
     {
         return new self(array_map(
-            function ($key, $val) use ($alt) {
+            function($key, $val) use ($alt) {
                 if ($alt) {
                     return [$key => $val];
                 }
@@ -1048,7 +1048,7 @@ 
         if (false !== ($condRet = $this->if2DMapInternalMethod(__METHOD__))) {
             return $condRet;
         }
-        $strvals = $this->map(function ($val) {
+        $strvals = $this->map(function($val) {
             return (string) $val;
         });
         $this->assertNumericValues();
@@ -1171,9 +1171,9 @@ 
     {
         $this->assertIsTabular();
 
-        return $this->sort(function ($a, $b) use ($key, $cmp) {
+        return $this->sort(function($a, $b) use ($key, $cmp) {
             if (!isset($a[$key]) || !isset($b[$key])) {
-                throw new RuntimeException('Cannot order collection by non-existant key: ' . $key);
+                throw new RuntimeException('Cannot order collection by non-existant key: '.$key);
             }
             if (is_null($cmp)) {
                 return strcasecmp($a[$key], $b[$key]);
@@ -1207,7 +1207,7 @@ 
      */
     public function is2D()
     {
-        return !$this->contains(function ($val) {
+        return !$this->contains(function($val) {
             return !is_array($val);
         });
     }
@@ -1226,7 +1226,7 @@ 
             // look through each item in the collection and if an array, grab its keys
             // and throw them in an array to be analyzed later...
             $test = [];
-            $this->walk(function ($val, $key) use (&$test) {
+            $this->walk(function($val, $key) use (&$test) {
                 if (is_array($val)) {
                     $test[$key] = array_keys($val);
 
@@ -1298,7 +1298,7 @@ 
             if (count($method) == 2) {
                 $method = $method[1];
 
-                return $this->map(function ($val) use ($method) {
+                return $this->map(function($val) use ($method) {
                     return (new self($val))->$method();
                 });
             }
@@ -1332,7 +1332,7 @@ 
 
     protected function assertNumericValues()
     {
-        if ($this->contains(function ($val) {
+        if ($this->contains(function($val) {
             return !is_numeric($val);
         })) {
             // can't average non-numeric data
@@ -1348,6 +1348,6 @@ 
         if (is_null($data) || is_array($data) || $data instanceof Iterator) {
             return;
         }
-        throw new InvalidArgumentException('Invalid type for collection data: ' . gettype($data));
+        throw new InvalidArgumentException('Invalid type for collection data: '.gettype($data));
     }
 }

src/CSVelte/Taster.php

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();