nozavroni / csvelte

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

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/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/IO/BufferStream.php

Indentation +10 added lines, -10 removed lines

@@ -267,16 +267,16 @@
         return strlen($data);
     }
 
-     /**
-      * Seekability accessor.
-      *
-      * Despite the fact that any class that implements this interface must also
-      * define methods such as seek, that is no guarantee that an
-      * object will necessarily be seekable. This method should tell the user
-      * whether a stream is, in fact, seekable.
-      *
-      * @return boolean True if seekable, false otherwise
-      */
+        /**
+         * Seekability accessor.
+         *
+         * Despite the fact that any class that implements this interface must also
+         * define methods such as seek, that is no guarantee that an
+         * object will necessarily be seekable. This method should tell the user
+         * whether a stream is, in fact, seekable.
+         *
+         * @return boolean True if seekable, false otherwise
+         */
     public function isSeekable()
     {
         return $this->seekable;

Braces +3 added lines, -1 removed lines

@@ -138,7 +138,9 @@
     public function readChunk($start = null, $length = null)
     {
         //dd($this->buffer, false);
-        if ($this->buffer === false) return false;
+        if ($this->buffer === false) {
+            return false;
+        }
         $top = substr($this->buffer, 0, $start);
         $data = substr($this->buffer, $start, $length);
         $bottom = substr($this->buffer, $start + $length);

Doc Comments +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
      * Read in the specified amount of characters from the input source
      *
      * @param integer Amount of characters to read from input source
-     * @return string|boolean The specified amount of characters read from input source
+     * @return false|string The specified amount of characters read from input source
      */
     public function read($chars)
     {
@@ -246,7 +246,7 @@ 
      *
      * After the stream has been detached, the stream is in an unusable state.
      *
-     * @return BufferStream|null Underlying PHP stream, if any
+     * @return string Underlying PHP stream, if any
      */
     public function detach()
     {

src/CSVelte/Collection.php

Spacing +9 added lines, -9 removed lines

@@ -194,7 +194,7 @@ 
     public function toArray()
     {
         $data = [];
-        foreach($this->data as $key => $val) {
+        foreach ($this->data as $key => $val) {
             $data[$key] = (is_object($val) && method_exists($val, 'toArray')) ? $val->toArray() : $val;
         }
         return $data;
@@ -369,7 +369,7 @@ 
             if ($i === $pos) return $key;
             $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);
     }
 
     /**
@@ -554,7 +554,7 @@ 
             return $this->data[$key];
         } else {
             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;
@@ -899,7 +899,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];
                 } else {
@@ -981,7 +981,7 @@ 
         if (false !== ($condRet = $this->if2DMapInternalMethod(__METHOD__))) {
             return $condRet;
         }
-        $strvals = $this->map(function($val){
+        $strvals = $this->map(function($val) {
             return (string) $val;
         });
         $this->assertNumericValues();
@@ -1095,7 +1095,7 @@ 
         $this->assertIsTabular();
         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]);
@@ -1142,7 +1142,7 @@ 
      */
     public function is2D()
     {
-        return !$this->contains(function($val){
+        return !$this->contains(function($val) {
             return !is_array($val);
         });
         return false;
@@ -1212,7 +1212,7 @@ 
 
     protected function assertNumericValues()
     {
-        if ($this->contains(function($val){
+        if ($this->contains(function($val) {
             return !is_numeric($val);
         })) {
             // can't average non-numeric data
@@ -1228,6 +1228,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));
     }
 }

Braces +30 added lines, -11 removed lines

@@ -153,8 +153,9 @@ 
             }
         } else {
             if (is_null($key)) {
-                if (is_array($val)) return $this->merge($val);
-                else {
+                if (is_array($val)) {
+                    return $this->merge($val);
+                } else {
                     if (is_callable($val)) {
                         return $this->map($val);
                     } /*else {
@@ -248,7 +249,9 @@ 
     {
         if (is_callable($callback = $val)) {
             foreach ($this->data as $key => $val) {
-                if ($callback($val, $key)) return true;
+                if ($callback($val, $key)) {
+                    return true;
+                }
             }
         } elseif (in_array($val, $this->data)) {
             return (is_null($key) || (isset($this->data[$key]) && $this->data[$key] == $val));
@@ -366,7 +369,9 @@ 
     {
         $i = 0;
         foreach ($this->data as $key => $val) {
-            if ($i === $pos) return $key;
+            if ($i === $pos) {
+                return $key;
+            }
             $i++;
         }
         throw new OutOfBoundsException("Collection data does not contain a key at given position: " . $pos);
@@ -744,7 +749,9 @@ 
     {
         foreach ($this->data as $key => $val) {
             if (!$ret = $callback($val, $key)) {
-                if ($ret === false) break;
+                if ($ret === false) {
+                    break;
+                }
             }
         }
         return $this;
@@ -776,7 +783,9 @@ 
     {
         $keys = [];
         foreach ($this->data as $key => $val) {
-            if (false === $callback($val, $key)) $keys[$key] = true;
+            if (false === $callback($val, $key)) {
+                $keys[$key] = true;
+            }
         }
         return new self(array_diff_key($this->data, $keys));
     }
@@ -793,7 +802,9 @@ 
     public function first(Callable $callback)
     {
         foreach ($this->data as $key => $val) {
-            if ($callback($val, $key)) return $val;
+            if ($callback($val, $key)) {
+                return $val;
+            }
         }
         return null;
     }
@@ -811,7 +822,9 @@ 
     {
         $elem = null;
         foreach ($this->data as $key => $val) {
-            if ($callback($val, $key)) $elem = $val;
+            if ($callback($val, $key)) {
+                $elem = $val;
+            }
         }
         return $elem;
     }
@@ -1062,7 +1075,9 @@ 
      */
     public function sort(Callable $callback = null, $preserve_keys = true)
     {
-        if (is_null($callback)) $callback = 'strcasecmp';
+        if (is_null($callback)) {
+            $callback = 'strcasecmp';
+        }
         if (!is_callable($callback)) {
             throw new InvalidArgumentException(sprintf(
                 'Invalid argument supplied for %s. Expected %s, got: "%s".',
@@ -1172,7 +1187,9 @@ 
 
             // if the list of array keys is shorter than the total amount of items in
             // the collection, than this is not tabular data
-            if (count($test) != count($this)) return false;
+            if (count($test) != count($this)) {
+                return false;
+            }
 
             // loop through the array of each item's array keys that we just created
             // and compare it to the FIRST item. If any array contains different keys
@@ -1180,7 +1197,9 @@ 
             $first = array_shift($test);
             foreach ($test as $key => $keys) {
                 $diff = array_diff($first, $keys);
-                if (!empty($diff)) return false;
+                if (!empty($diff)) {
+                    return false;
+                }
             }
             return true;
         }

Doc Comments +14 added lines, -11 removed lines

@@ -615,7 +615,7 @@ 
      *
      * @param int|mixed The offset to set
      * @param any The value to set it to
-     * @return boolean
+     * @return Collection
      */
     public function offsetSet($offset, $value)
     {
@@ -684,7 +684,7 @@ 
      *
      * @param boolean $multi Whether to count just the items in the collection or
      *     to count the items in each tabular data row.
-     * @return int|\CSVelte\Collection Either an integer count or a collection of counts
+     * @return string Either an integer count or a collection of counts
      */
     public function count($multi = false)
     {
@@ -771,7 +771,7 @@ 
      * Filter out unwanted items using a callback function.
      *
      * @param Callable $callback
-     * @return CSVelte\Collection A new collection with filtered items removed
+     * @return Collection A new collection with filtered items removed
      */
     public function filter(Callable $callback)
     {
@@ -823,7 +823,7 @@ 
      * Returns an array where the key is a value in the collection and the value
      * is the number of times that value appears in the collection.
      *
-     * @return CSVelte\Collection A collection of value frequencies (see description)
+     * @return Collection A collection of value frequencies (see description)
      */
     public function frequency()
     {
@@ -847,7 +847,7 @@ 
      * Returns a collection with duplicate values removed. If two-dimensional,
      * then each array within the collection will have its duplicates removed.
      *
-     * @return CSVelte\Collection A new collection with duplicate values removed.
+     * @return Collection A new collection with duplicate values removed.
      */
     public function unique()
     {
@@ -863,7 +863,7 @@ 
      * Returns a collection of arrays where the key is the duplicate value
      * and the value is an array of keys from the original collection.
      *
-     * @return CSVelte\Collection A new collection with duplicate values.
+     * @return Collection A new collection with duplicate values.
      */
     public function duplicates()
     {
@@ -881,7 +881,7 @@ 
      *
      * Get a new collection where the keys and values have been swapped.
      *
-     * @return CSVelte\Collection A new collection where keys/values have been swapped
+     * @return Collection A new collection where keys/values have been swapped
      */
     public function flip()
     {
@@ -895,7 +895,7 @@ 
      * first is the default.
      *
      * @param boolean Whether you want pairs in [k => v] rather than [k, v] format
-     * @return CSVelte\Collection A collection of key/value pairs
+     * @return Collection A collection of key/value pairs
      */
     public function pairs($alt = false)
     {
@@ -1059,7 +1059,7 @@ 
      *
      * @param Callable $callback The sorting function you want to use
      * @param boolean $preserve_keys Whether you want to preserve keys
-     * @return CSVelte\Collection A new collection sorted by $callback
+     * @return Collection A new collection sorted by $callback
      */
     public function sort(Callable $callback = null, $preserve_keys = true)
     {
@@ -1089,7 +1089,7 @@ 
      * @param string $key The key you want to order by
      * @param Callable $cmp The sorting comparison algorithm to use
      * @param boolean $preserve_keys Whether keys should be preserved
-     * @return CSVelte\Collection A new collection sorted by $cmp and $key
+     * @return Collection A new collection sorted by $cmp and $key
      */
     public function orderBy($key, Callable $cmp = null, $preserve_keys = true)
     {
@@ -1113,13 +1113,16 @@ 
      * trying to write a particular sorting algurithm that sorts forwards and back.
      *
      * @param boolean $preserve_keys Whether keys should be preserved
-     * @return CSVelte\Collection A new collection in reverse order
+     * @return Collection A new collection in reverse order
      */
     public function reverse($preserve_keys = true)
     {
         return new self(array_reverse($this->data, $preserve_keys));
     }
 
+    /**
+     * @param string $method
+     */
     protected function if2DMapInternalMethod($method)
     {
         if ($this->is2D()) {

src/CSVelte/functions.php

Braces +3 added lines, -1 removed lines

@@ -91,7 +91,9 @@
 {
     $res = (new Resource($uri, $mode))
         ->setContextResource($context);
-    if (!$lazy) $res->connect();
+    if (!$lazy) {
+        $res->connect();
+    }
     return $res;
 }
 

src/CSVelte/Contract/Streamable.php

Indentation +10 added lines, -10 removed lines

@@ -267,16 +267,16 @@
         return strlen($data);
     }
 
-     /**
-      * Seekability accessor.
-      *
-      * Despite the fact that any class that implements this interface must also
-      * define methods such as seek, that is no guarantee that an
-      * object will necessarily be seekable. This method should tell the user
-      * whether a stream is, in fact, seekable.
-      *
-      * @return boolean True if seekable, false otherwise
-      */
+        /**
+         * Seekability accessor.
+         *
+         * Despite the fact that any class that implements this interface must also
+         * define methods such as seek, that is no guarantee that an
+         * object will necessarily be seekable. This method should tell the user
+         * whether a stream is, in fact, seekable.
+         *
+         * @return boolean True if seekable, false otherwise
+         */
     public function isSeekable()
     {
         return $this->seekable;

src/CSVelte/IO/IteratorStream.php

Indentation +10 added lines, -10 removed lines

@@ -267,16 +267,16 @@
         return strlen($data);
     }
 
-     /**
-      * Seekability accessor.
-      *
-      * Despite the fact that any class that implements this interface must also
-      * define methods such as seek, that is no guarantee that an
-      * object will necessarily be seekable. This method should tell the user
-      * whether a stream is, in fact, seekable.
-      *
-      * @return boolean True if seekable, false otherwise
-      */
+        /**
+         * Seekability accessor.
+         *
+         * Despite the fact that any class that implements this interface must also
+         * define methods such as seek, that is no guarantee that an
+         * object will necessarily be seekable. This method should tell the user
+         * whether a stream is, in fact, seekable.
+         *
+         * @return boolean True if seekable, false otherwise
+         */
     public function isSeekable()
     {
         return $this->seekable;

Doc Comments +1 added lines, -1 removed lines

@@ -259,7 +259,7 @@
     /**
      * Closes the stream and any underlying resources.
      *
-     * @return void
+     * @return boolean
      */
     public function close()
     {