nozavroni / csvelte

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/Table/AbstractRow.php

Braces +6 added lines, -2 removed lines

@@ -151,7 +151,9 @@ 
     public function next()
     {
         $this->position++;
-        if ($this->valid()) return $this->current();
+        if ($this->valid()) {
+            return $this->current();
+        }
     }
 
     /**
@@ -163,7 +165,9 @@ 
     public function rewind()
     {
         $this->position = 0;
-        if ($this->valid()) return $this->current();
+        if ($this->valid()) {
+            return $this->current();
+        }
     }
 
     /**

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

Braces +6 added lines, -2 removed lines

@@ -56,7 +56,9 @@ 
 
     public static function average($arr)
     {
-        if (!is_array($arr)) throw new \InvalidArgumentException('"average" function expected array, got ' . gettype($arr));
+        if (!is_array($arr)) {
+            throw new \InvalidArgumentException('"average" function expected array, got ' . gettype($arr));
+        }
         return array_sum($arr) / count($arr);
     }
 
@@ -71,7 +73,9 @@ 
 
     public static function mode($arr)
     {
-        if (!is_array($arr)) throw new \InvalidArgumentException('"mode" function expected array, got ' . gettype($arr));
+        if (!is_array($arr)) {
+            throw new \InvalidArgumentException('"mode" function expected array, got ' . gettype($arr));
+        }
         $vals = array();
         foreach ($arr as $key => $val) {
             $vals[$val] = self::array_get($vals, $val, 0) + 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/Taster.php

Braces +36 added lines, -13 removed lines

@@ -145,7 +145,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);
         }
@@ -244,7 +246,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) {
             $quotes = array_count_values($matches['quoteChar']);
@@ -283,7 +287,9 @@ 
         $charFrequency = array();
         while ($start < count($lines)) {
             foreach ($lines as $key => $line) {
-                if (!trim($line)) continue;
+                if (!trim($line)) {
+                    continue;
+                }
                 foreach ($delimiters as $char) {
                     $freq = substr_count($line, $char);
                     $charFrequency[$char][$key] = $freq;
@@ -376,11 +382,18 @@ 
         }
         $types = array_unique($freq['quoted']);
         // if quoting_styles still has QUOTE_ALL or QUOTE_NONE, then that's the one to return
-        if (array_key_exists(Flavor::QUOTE_ALL, $quoting_styles)) return Flavor::QUOTE_ALL;
-        if (array_key_exists(Flavor::QUOTE_NONE, $quoting_styles)) return Flavor::QUOTE_NONE;
+        if (array_key_exists(Flavor::QUOTE_ALL, $quoting_styles)) {
+            return Flavor::QUOTE_ALL;
+        }
+        if (array_key_exists(Flavor::QUOTE_NONE, $quoting_styles)) {
+            return Flavor::QUOTE_NONE;
+        }
         if (count($types) == 1) {
-            if (current($types) == self::DATA_SPECIAL) return Flavor::QUOTE_MINIMAL;
-            elseif (current($types) == self::DATA_NONNUMERIC) return Flavor::QUOTE_NONNUMERIC;
+            if (current($types) == self::DATA_SPECIAL) {
+                return Flavor::QUOTE_MINIMAL;
+            } elseif (current($types) == self::DATA_NONNUMERIC) {
+                return Flavor::QUOTE_NONNUMERIC;
+            }
         } else {
             if (array_key_exists(self::DATA_NONNUMERIC, array_flip($types))) {
                 // allow for a SMALL amount of error here
@@ -392,7 +405,9 @@ 
                 $most = current($counts);
                 $least = end($counts);
                 $err_margin = $least / $most;
-                if ($err_margin < 1) return Flavor::QUOTE_NONNUMERIC;
+                if ($err_margin < 1) {
+                    return Flavor::QUOTE_NONNUMERIC;
+                }
             }
         }
         return Flavor::QUOTE_MINIMAL;
@@ -583,15 +598,23 @@ 
         foreach ($types as $line_no => $cols) {
             foreach ($cols as $col_no => $col_info) {
                 extract($col_info);
-                if (!array_key_exists($col_no, $potential_header)) continue;
+                if (!array_key_exists($col_no, $potential_header)) {
+                    continue;
+                }
                 extract($potential_header[$col_no], 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 {
-                    if ($type != $header_type) $hasHeader++;
-                    else $hasHeader--;
+                    if ($type != $header_type) {
+                        $hasHeader++;
+                    } else {
+                        $hasHeader--;
+                    }
                 }
             }
         }

src/CSVelte/IO/Stream.php

Braces +15 added lines, -5 removed lines

@@ -225,7 +225,9 @@ 
      */
     protected static function open($stream, $mode = null, $context = null)
     {
-        if (is_null($mode)) $mode = 'r+b';
+        if (is_null($mode)) {
+            $mode = 'r+b';
+        }
         if (is_string($uri = $stream)) {
             if (is_null($context)) {
                 $stream = @fopen($uri, $mode);
@@ -289,8 +291,12 @@ 
      */
     public function getMetaData($key = null)
     {
-        if (!$this->stream) return null;
-        if (is_null($key)) return $this->meta;
+        if (!$this->stream) {
+            return null;
+        }
+        if (is_null($key)) {
+            return $this->meta;
+        }
         return (array_key_exists($key, $this->meta)) ? $this->meta[$key] : null;
     }
 
@@ -388,7 +394,9 @@ 
      */
     public function getSize()
     {
-        if (!$this->stream) return null;
+        if (!$this->stream) {
+            return null;
+        }
         if (is_null($this->size)) {
             $stats = fstat($this->stream);
             if (array_key_exists('size', $stats)) {
@@ -422,7 +430,9 @@ 
     public function read($length)
     {
         $this->assertIsReadable();
-        if ($this->eof()) return false;
+        if ($this->eof()) {
+            return false;
+        }
         return fread($this->stream, $length);
     }
 

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