nozavroni / csvelte

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/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/Reader.php

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.

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/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)
     {

Spacing +31 added lines, -31 removed lines

@@ -233,11 +233,11 @@ 
         $types = new TabularCollection();
 
         // callback to build the aforementioned collection
-        $buildTypes = function ($line, $line_no) use ($types, $delim, $eol) {
+        $buildTypes = function($line, $line_no) use ($types, $delim, $eol) {
 
             if ($line_no > 2) return;
             $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);
                 $fieldMeta = [
                     "value" => $field,
@@ -265,8 +265,8 @@ 
 
         $hasHeader = new NumericCollection();
         $possibleHeader = collect($types->shift());
-        $types->walk(function (AbstractCollection $row) use ($hasHeader, $possibleHeader) {
-            $row->walk(function (AbstractCollection $fieldMeta, $col_no) use ($hasHeader, $possibleHeader) {
+        $types->walk(function(AbstractCollection $row) use ($hasHeader, $possibleHeader) {
+            $row->walk(function(AbstractCollection $fieldMeta, $col_no) use ($hasHeader, $possibleHeader) {
                 try {
                     $col = collect($possibleHeader->get($col_no, null, true));
                     if ($fieldMeta->get('type') == self::TYPE_STRING) {
@@ -330,9 +330,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;
@@ -375,12 +375,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...
@@ -389,7 +389,7 @@ 
             }
         }
         if ($matches) {
-            $qcad = array_intersect_key($matches, array_flip(['quoteChar','delim']));
+            $qcad = array_intersect_key($matches, array_flip(['quoteChar', 'delim']));
             if (!empty($matches['quoteChar']) && !empty($matches['delim'])) {
                 try {
                     return [
@@ -431,15 +431,15 @@ 
         // 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) {
                         try {
                             $char_counts = $frequencies->get($char, null, true);
                         } catch (OutOfBoundsException $e) {
@@ -452,8 +452,8 @@ 
             // 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) {
-                $frequencies->walk(function ($counts, $char) use ($line_no, $frequencies) {
+            ->walk(function($line, $line_no) use ($frequencies) {
+                $frequencies->walk(function($counts, $char) use ($line_no, $frequencies) {
                     try {
                         $char_counts = $frequencies->get($char, null, true);
                     } catch (OutOfBoundsException $e) {
@@ -472,8 +472,8 @@ 
         foreach ($frequencies as $char => $freq) {
             $modes->set($char, (new NumericCollection($freq))->mode());
         }
-        $frequencies->walk(function ($f, $chr) use ($modes, $consistencies) {
-            collect($f)->walk(function ($num) use ($modes, $chr, $consistencies) {
+        $frequencies->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!
@@ -564,19 +564,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())) {
@@ -585,7 +585,7 @@ 
                 });
 
                 return $linedist;
-            })->map(function ($dists) {
+            })->map(function($dists) {
                 return $dists->average();
             })->sort()
               ->reverse()
@@ -635,9 +635,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);
@@ -658,7 +658,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
@@ -678,7 +678,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...
@@ -771,7 +771,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);
 
@@ -811,7 +811,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/Table/AbstractRow.php

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

src/CSVelte/Writer.php

Spacing +7 added lines, -7 removed lines

@@ -114,7 +114,7 @@ 
         if (is_array($headers)) {
             $headers = new ArrayIterator($headers);
         }
-        $this->headers                   = $headers;
+        $this->headers = $headers;
 
         return $this;
     }
@@ -137,7 +137,7 @@ 
         if (is_array($row)) {
             $row = new ArrayIterator($row);
         }
-        $row                     = $this->prepareRow($row);
+        $row = $this->prepareRow($row);
         if ($count = $this->output->writeLine($row->join($delim), $eol)) {
             $this->written++;
 
@@ -160,7 +160,7 @@ 
             $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) {
@@ -203,7 +203,7 @@ 
     {
         $items = [];
         foreach ($row as $data) {
-            $items []= $this->prepareData($data);
+            $items [] = $this->prepareData($data);
         }
         $row = new Row($items);
 
@@ -240,8 +240,8 @@ 
         // Normally I would make this a method on the class, but I don't intend
         // 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);
+        $hasSpecialChars = function($s) use ($flvr) {
+            $specialChars = preg_quote($flvr->lineTerminator.$flvr->quoteChar.$flvr->delimiter);
             $pattern      = "/[{$specialChars}]/m";
 
             return preg_match($pattern, $s);
@@ -289,6 +289,6 @@ 
             $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);
     }
 }

src/CSVelte/Flavor.php

Spacing +2 added lines, -2 removed lines

@@ -204,7 +204,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);
     }
 
     /**
@@ -270,7 +270,7 @@ 
     protected function assertValidAttribute($attr)
     {
         if (!property_exists(self::class, $attr)) {
-            throw new InvalidArgumentException('Unknown attribute: ' . $attr);
+            throw new InvalidArgumentException('Unknown attribute: '.$attr);
         }
     }
 }

src/CSVelte/Traits/IsReadable.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
             }
             $buffer .= $byte;
             // Break when a new line is found or the max length - 1 is reached
-            if (array_reduce($eol, function ($carry, $eol) use ($buffer) {
+            if (array_reduce($eol, function($carry, $eol) use ($buffer) {
                 if (!$carry) {
                     $eollen = 0 - strlen($eol);