nozavroni / csvelte

src/CSVelte/Collection/AbstractCollection.php

Doc Comments +4 added lines, -4 removed lines

@@ -280,7 +280,7 @@ 
      * also optionally throw an OutOfBoundsException if no value is found.
      *
      * @param mixed $index The index of the data you want to get
-     * @param mixed $default The default value to return if none available
+     * @param null|integer $default The default value to return if none available
      * @param bool $throw True if you want an exception to be thrown if no data found at $index
      * @throws OutOfBoundsException If $throw is true and $index isn't found
      * @return mixed The data found at $index or failing that, the $default
@@ -545,7 +545,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 AbstractCollection The first item in this collection
      */
     public function push(...$items)
     {
@@ -558,7 +558,7 @@ 
      *
      * Returns a new collection with $items added.
      *
-     * @return mixed The first item in this collection
+     * @return AbstractCollection The first item in this collection
      */
     public function unshift(...$items)
     {
@@ -697,7 +697,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 AbstractCollection This collection in reverse order.
      */
     public function reverse($preserveKeys = null)

Spacing +11 added lines, -11 removed lines

@@ -165,7 +165,7 @@ 
      *
      * @return mixed
      */
-    public function current ()
+    public function current()
     {
         return current($this->data);
     }
@@ -177,7 +177,7 @@ 
      *
      * @return mixed
      */
-    public function key ()
+    public function key()
     {
         return key($this->data);
     }
@@ -191,7 +191,7 @@ 
      *
      * @return mixed
      */
-    public function next ()
+    public function next()
     {
         $next = next($this->data);
         $key = key($this->data);
@@ -210,7 +210,7 @@ 
      *
      * @return mixed
      */
-    public function rewind ()
+    public function rewind()
     {
         $this->isValid = true;
         return reset($this->data);
@@ -223,7 +223,7 @@ 
      *
      * @return bool True if internal pointer isn't past the end
      */
-    public function valid ()
+    public function valid()
     {
         return $this->isValid;
     }
@@ -292,7 +292,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;
     }
@@ -332,7 +332,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);
             }
         }
 
@@ -621,7 +621,7 @@ 
     public function pairs()
     {
         return static::factory(array_map(
-            function ($key, $val) {
+            function($key, $val) {
                 return [$key, $val];
             },
             array_keys($this->data),
@@ -766,7 +766,7 @@ 
                 }
 
                 if (method_exists($val, '__toString')) {
-                    $val = (string)$val;
+                    $val = (string) $val;
                 } else {
                     $val = spl_object_hash($val);
                 }
@@ -815,7 +815,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));
         }
     }
 
@@ -859,7 +859,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/Collection/TabularCollection.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
             return static::factory($values);
         }
         if ($throw) {
-            throw new OutOfBoundsException(__CLASS__ . " could not find column: " . $column);
+            throw new OutOfBoundsException(__CLASS__." could not find column: ".$column);
         }
         return false;
     }
@@ -100,7 +100,7 @@ 
             return static::factory($this->data[$index]);
         }
         if ($throw) {
-            throw new OutOfBoundsException(__CLASS__ . " could not find row: " . $offset);
+            throw new OutOfBoundsException(__CLASS__." could not find row: ".$offset);
         }
         return false;
     }
@@ -176,6 +176,6 @@ 
                 return call_user_func_array([$column, $method], $args);
             }
         }
-        throw new BadMethodCallException("Method does not exist: " . __CLASS__ . "::{$method}()");
+        throw new BadMethodCallException("Method does not exist: ".__CLASS__."::{$method}()");
     }
 }
\ No newline at end of file

src/CSVelte/Taster.php

Spacing +31 added lines, -31 removed lines

@@ -232,11 +232,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,
@@ -264,8 +264,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) {
@@ -329,9 +329,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;
@@ -374,12 +374,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...
@@ -388,7 +388,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 [
@@ -430,15 +430,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) {
@@ -451,8 +451,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 ($freqs as $char => $freq) {
             $modes->set($char, collect($freq)->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!
@@ -565,19 +565,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())) {
@@ -586,7 +586,7 @@ 
                 });
 
                 return $linedist;
-            })->map(function ($dists) {
+            })->map(function($dists) {
                 return $dists->average();
             })->sort()
               ->reverse()
@@ -636,9 +636,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);
@@ -659,7 +659,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
@@ -679,7 +679,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...
@@ -772,7 +772,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);
 
@@ -812,7 +812,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();