nozavroni / csvelte

src/CSVelte/IO/Stream.php

Unused Use Statements -3 removed lines

@@ -16,14 +16,11 @@
 use CSVelte\Traits\IsReadable;
 use CSVelte\Traits\IsWritable;
 use CSVelte\Traits\IsSeekable;
-
 use CSVelte\Contract\Readable;
 use CSVelte\Contract\Writable;
 use CSVelte\Contract\Seekable;
 
 use \InvalidArgumentException;
-use CSVelte\Exception\NotYetImplementedException;
-use CSVelte\Exception\EndOfFileException;
 use CSVelte\Exception\IOException;
 
 /**

Braces +9 added lines, -3 removed lines

@@ -136,7 +136,9 @@ 
     {
         $resource = (new Resource($uri, $mode))
             ->setContextResource($context);
-        if (!$lazy) $resource->connect();
+        if (!$lazy) {
+            $resource->connect();
+        }
         return new self($resource);
     }
 
@@ -169,7 +171,9 @@ 
             }
             // if a certain value was requested, return it
             // otherwise, return entire array
-            if (is_null($key)) return $this->meta;
+            if (is_null($key)) {
+                return $this->meta;
+            }
             return (array_key_exists($key, $this->meta)) ? $this->meta[$key] : null;
         }
     }
@@ -315,7 +319,9 @@ 
     public function read($length)
     {
         $this->assertIsReadable();
-        if ($this->eof()) return false;
+        if ($this->eof()) {
+            return false;
+        }
         return fread($this->resource->getHandle(), $length);
     }
 

src/CSVelte/Flavor.php

Braces +3 added lines, -2 removed lines

@@ -191,8 +191,9 @@
      */
     protected function assertValidAttribute($attr)
     {
-        if (!property_exists(self::class, $attr))
-            throw new InvalidArgumentException("Unknown attribute: " . $attr);
+        if (!property_exists(self::class, $attr)) {
+                    throw new InvalidArgumentException("Unknown attribute: " . $attr);
+        }
     }
 
     /**

src/CSVelte/Traits/IsReadable.php

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
     {
         $size = 0;
         $buffer = false;
-        if (!is_array($eol)) $eol = array($eol);
+        if (!is_array($eol)) {
+            $eol = array($eol);
+        }
         while (!$this->eof()) {
             // Using a loose equality here to match on '' and false.
             if (null == ($byte = $this->read(1))) {

src/CSVelte/Reader.php

Braces +18 added lines, -6 removed lines

@@ -104,7 +104,9 @@ 
      */
     protected function setFlavor($flavor = null)
     {
-        if (is_array($flavor)) $flavor = new Flavor($flavor);
+        if (is_array($flavor)) {
+            $flavor = new Flavor($flavor);
+        }
         $taster = new Taster($this->source);
         // @todo put this inside a try/catch
         if (is_null($flavor)) {
@@ -159,7 +161,9 @@ 
                     $this->header = new HeaderRow($parsed);
                 } else {
                     $this->current = new Row($parsed);
-                    if ($this->header) $this->current->setHeaderRow($this->header);
+                    if ($this->header) {
+                        $this->current->setHeaderRow($this->header);
+                    }
                 }
             } catch (EndOfFileException $e) {
                 $this->current = false;
@@ -183,7 +187,9 @@ 
         $eol = $f->lineTerminator;
         try {
             do {
-                if (!isset($lines)) $lines = array();
+                if (!isset($lines)) {
+                    $lines = array();
+                }
                 if (false === ($line = $this->source->readLine($eol))) {
                     throw new EndOfFileException("End of file reached: " . $this->source->getName());
                 }
@@ -191,7 +197,9 @@ 
             } while ($this->inQuotedString(end($lines), $f->quoteChar, $f->escapeChar));
         } catch (EndOfFileException $e) {
             // only throw the exception if we don't already have lines in the buffer
-            if (!count($lines)) throw $e;
+            if (!count($lines)) {
+                throw $e;
+            }
         }
         return rtrim(implode($eol, $lines), $eol);
     }
@@ -211,14 +219,18 @@ 
     {
         if (!empty($line)) {
             do {
-                if (!isset($i)) $i = 0;
+                if (!isset($i)) {
+                    $i = 0;
+                }
                 $c = $line[$i++];
                 if ($this->escape) {
                     $this->escape = false;
                     continue;
                 }
                 $this->escape = ($c == $escapeChar);
-                if ($c == $quoteChar) $this->open = !$this->open;
+                if ($c == $quoteChar) {
+                    $this->open = !$this->open;
+                }
             } while ($i < strlen($line));
         }
         return $this->open;

src/CSVelte/Autoloader.php

Braces +3 added lines, -1 removed lines

@@ -61,7 +61,9 @@
     {
         $paths = $this->getPaths();
         if ($rp = realpath($path)) {
-            if (in_array($rp, $paths)) return true;
+            if (in_array($rp, $paths)) {
+                return true;
+            }
             $this->paths []= $rp;
             return true;
         }

src/CSVelte/Writer.php

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

Braces +34 added lines, -12 removed lines

@@ -169,7 +169,9 @@ 
         try {
             list($quoteChar, $delimiter) = $this->lickQuoteAndDelim();
         } catch (TasterException $e) {
-            if ($e->getCode() !== TasterException::ERR_QUOTE_AND_DELIM) throw $e;
+            if ($e->getCode() !== TasterException::ERR_QUOTE_AND_DELIM) {
+                throw $e;
+            }
             $quoteChar = '"';
             $delimiter = $this->lickDelimiter($lineTerminator);
         }
@@ -265,7 +267,9 @@ 
         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...
-            if (@preg_match_all($pattern, $this->sample, $matches) && $matches) break;
+            if (@preg_match_all($pattern, $this->sample, $matches) && $matches) {
+                break;
+            }
         }
         if ($matches) {
             try {
@@ -388,7 +392,9 @@ 
                  // 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;
+                    if ($delim = array_search($val, $decision)) {
+                        return $delim;
+                    }
                  }
              }
         }
@@ -431,7 +437,9 @@ 
             return $delims[collect($delims)->map(function($delim) use (&$distrib, $lines) {
                 $linedist = collect();
                 $lines->walk(function($line, $line_no) use (&$linedist, $delim) {
-                    if (!strlen($line)) return;
+                    if (!strlen($line)) {
+                        return;
+                    }
                     $sectstot = 10;
                     $sectlen = (int) (strlen($line) / $sectstot);
                     $sections = collect(str_split($line, $sectlen))
@@ -519,8 +527,12 @@ 
         $quoting_styles = $quoting_styles->filter(function($val) { return (bool) $val; });
         // if quoting_styles still has QUOTE_ALL or QUOTE_NONE, then return
         // whichever of them it is, we don't need to do anything else
-        if ($quoting_styles->has(Flavor::QUOTE_ALL)) return Flavor::QUOTE_ALL;
-        if ($quoting_styles->has(Flavor::QUOTE_NONE)) return Flavor::QUOTE_NONE;
+        if ($quoting_styles->has(Flavor::QUOTE_ALL)) {
+            return Flavor::QUOTE_ALL;
+        }
+        if ($quoting_styles->has(Flavor::QUOTE_NONE)) {
+            return Flavor::QUOTE_NONE;
+        }
         if (count($types) == 1) {
             $style = $types->getValueAtPosition(0);
             if ($quoting_styles->has($style)) {
@@ -537,7 +549,9 @@ 
                 if ($most = $counts->max()) {
                     $least = $counts->min();
                     $err_margin = $least / $most;
-                    if ($err_margin < 1) return Flavor::QUOTE_NONNUMERIC;
+                    if ($err_margin < 1) {
+                        return Flavor::QUOTE_NONNUMERIC;
+                    }
                 }
             }
         }
@@ -712,7 +726,9 @@ 
                 $field = str_replace(self::PLACEHOLDER_DELIM, $delim, $field);
                 // @todo Need a Collection::setTableField($x, $y) method
                 //       See notes in green binder about refactoring Collection
-                if (!$types->has($line_no)) $types->set($line_no, collect());
+                if (!$types->has($line_no)) {
+                    $types->set($line_no, collect());
+                }
                 $types->get($line_no)->set($colpos, [
                     'type' => $this->lickType($this->unQuote($field)),
                     'length' => strlen($field)
@@ -735,12 +751,18 @@ 
                     extract($possibleHeader->get($col_no, null, true), EXTR_PREFIX_ALL, "header");
                     if ($header_type == self::TYPE_STRING) {
                         // use length
-                        if ($length != $header_length) $hasHeader++;
-                        else $hasHeader--;
+                        if ($length != $header_length) {
+                            $hasHeader++;
+                        } else {
+                            $hasHeader--;
+                        }
                     } else {
                         // use data type
-                        if ($type != $header_type) $hasHeader++;
-                        else $hasHeader--;
+                        if ($type != $header_type) {
+                            $hasHeader++;
+                        } else {
+                            $hasHeader--;
+                        }
                     }
                 } catch (OutOfBoundsException $e) {
                     // failure...

src/CSVelte/IO/Resource.php

Braces +9 added lines, -3 removed lines

@@ -254,7 +254,9 @@ 
                 $this->getContext()
             );
             restore_error_handler();
-            if ($e) throw $e;
+            if ($e) {
+                throw $e;
+            }
         }
         return $this->isConnected();
     }
@@ -328,7 +330,9 @@ 
     public function setMode($mode = null)
     {
         $this->assertNotConnected(__METHOD__);
-        if (is_null($mode)) $mode = "r+b";
+        if (is_null($mode)) {
+            $mode = "r+b";
+        }
 
         $mode = substr($mode, 0, 3);
         $rest = substr($mode, 1);
@@ -436,7 +440,9 @@ 
      */
     protected function setLazy($lazy)
     {
-        if (is_null($lazy)) $lazy = true;
+        if (is_null($lazy)) {
+            $lazy = true;
+        }
         $this->lazy = (boolean) $lazy;
         return $this;
     }

src/CSVelte/Collection.php

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;
         }