@@ -40,7 +40,7 @@ |
||
40 | 40 | */ |
41 | 41 | public function writeLine($line, $eol = PHP_EOL) |
42 | 42 | { |
43 | - return $this->write($line . $eol); |
|
43 | + return $this->write($line.$eol); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | */ |
284 | 284 | protected function replaceQuotedSpecialChars($data, $delim, $quo, $eol) |
285 | 285 | { |
286 | - return preg_replace_callback('/(['. preg_quote($quo, '/') . '])(.*)\1/imsU', function($matches) use ($delim, $eol) { |
|
286 | + return preg_replace_callback('/(['.preg_quote($quo, '/').'])(.*)\1/imsU', function($matches) use ($delim, $eol) { |
|
287 | 287 | $ret = str_replace($eol, self::PLACEHOLDER_NEWLINE, $matches[0]); |
288 | 288 | $ret = str_replace($delim, self::PLACEHOLDER_DELIM, $ret); |
289 | 289 | return $ret; |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | */ |
336 | 336 | protected function unEscape($str, $esc, $quo) |
337 | 337 | { |
338 | - return str_replace($esc . $quo, $quo, $str); |
|
338 | + return str_replace($esc.$quo, $quo, $str); |
|
339 | 339 | } |
340 | 340 | |
341 | 341 | /** |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | */ |
477 | 477 | public function toArray() |
478 | 478 | { |
479 | - return array_map(function($row){ |
|
479 | + return array_map(function($row) { |
|
480 | 480 | return $row->toArray(); |
481 | 481 | }, iterator_to_array($this)); |
482 | 482 | } |
@@ -329,7 +329,7 @@ |
||
329 | 329 | * @param string $str The string to unescape |
330 | 330 | * @param string $esc The escape character used |
331 | 331 | * @param string $quo The quote character used |
332 | - * @return mixed The string with characters unescaped |
|
332 | + * @return string The string with characters unescaped |
|
333 | 333 | * @todo This actually shouldn't even be necessary. Characters should be read |
334 | 334 | * in one at a time and a quote that follows another should just be ignored |
335 | 335 | * deeming this unnecessary. |
@@ -14,11 +14,9 @@ |
||
14 | 14 | namespace CSVelte; |
15 | 15 | |
16 | 16 | use CSVelte\Contract\Streamable; |
17 | - |
|
18 | 17 | use CSVelte\Table\Row; |
19 | 18 | use CSVelte\Table\HeaderRow; |
20 | 19 | use CSVelte\Reader\FilteredIterator as FilteredReader; |
21 | - |
|
22 | 20 | use CSVelte\Exception\EndOfFileException; |
23 | 21 | |
24 | 22 | use function |
@@ -215,16 +215,16 @@ discard block |
||
215 | 215 | { |
216 | 216 | $str = $this->removeQuotedStrings($this->sample); |
217 | 217 | $eols = [ |
218 | - self::EOL_WINDOWS => "\r\n", // 0x0D - 0x0A - Windows, DOS OS/2 |
|
219 | - self::EOL_UNIX => "\n", // 0x0A - - Unix, OSX |
|
220 | - self::EOL_TRS80 => "\r", // 0x0D - - Apple ][, TRS80 |
|
218 | + self::EOL_WINDOWS => "\r\n", // 0x0D - 0x0A - Windows, DOS OS/2 |
|
219 | + self::EOL_UNIX => "\n", // 0x0A - - Unix, OSX |
|
220 | + self::EOL_TRS80 => "\r", // 0x0D - - Apple ][, TRS80 |
|
221 | 221 | ]; |
222 | 222 | |
223 | 223 | $curCount = 0; |
224 | 224 | // @todo This should return a default maybe? |
225 | 225 | $curEol = PHP_EOL; |
226 | - foreach($eols as $k => $eol) { |
|
227 | - if( ($count = substr_count($str, $eol)) > $curCount) { |
|
226 | + foreach ($eols as $k => $eol) { |
|
227 | + if (($count = substr_count($str, $eol)) > $curCount) { |
|
228 | 228 | $curCount = $count; |
229 | 229 | $curEol = $eol; |
230 | 230 | } |
@@ -256,12 +256,12 @@ discard block |
||
256 | 256 | $patterns = []; |
257 | 257 | // delim can be anything but line breaks, quotes, alphanumeric, underscore, backslash, or any type of spaces |
258 | 258 | $antidelims = implode(array("\r", "\n", "\w", preg_quote('"', '/'), preg_quote("'", '/')/*, preg_quote('\\', '/')*/, preg_quote(chr(self::SPACE), '/'))); |
259 | - $delim = '(?P<delim>[^' . $antidelims . '])'; |
|
259 | + $delim = '(?P<delim>[^'.$antidelims.'])'; |
|
260 | 260 | $quote = '(?P<quoteChar>"|\'|`)'; // @todo I think MS Excel uses some strange encoding for fancy open/close quotes |
261 | - $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 |
|
262 | - $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 |
|
263 | - $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 |
|
264 | - $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 |
|
261 | + $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 |
|
262 | + $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 |
|
263 | + $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 |
|
264 | + $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 |
|
265 | 265 | foreach ($patterns as $pattern) { |
266 | 266 | // @todo I had to add the error suppression char here because it was |
267 | 267 | // causing undefined offset errors with certain data sets. strange... |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | if ($types->contains(self::DATA_NONNUMERIC)) { |
531 | 531 | // allow for a SMALL amount of error here |
532 | 532 | $counts = collect([self::DATA_SPECIAL => 0, self::DATA_NONNUMERIC => 0]); |
533 | - $freq->get('quoted')->walk(function ($type) use (&$counts) { |
|
533 | + $freq->get('quoted')->walk(function($type) use (&$counts) { |
|
534 | 534 | $counts->increment($type); |
535 | 535 | }); |
536 | 536 | // @todo is all this even necessary? seems unnecessary to me... |
@@ -651,13 +651,13 @@ discard block |
||
651 | 651 | $day = '[0-3]?[0-9]'; |
652 | 652 | $sep = '[\/\.\-]?'; |
653 | 653 | $time = '([0-2]?[0-9](:[0-5][0-9]){1,2}(am|pm)?|[01]?[0-9](am|pm))'; |
654 | - $date = '(' . $month . $sep . $day . $sep . $year . '|' . $day . $sep . $month . $sep . $year . '|' . $year . $sep . $month . $sep . $day . ')'; |
|
654 | + $date = '('.$month.$sep.$day.$sep.$year.'|'.$day.$sep.$month.$sep.$year.'|'.$year.$sep.$month.$sep.$day.')'; |
|
655 | 655 | $dt = new DateTime($data); |
656 | - $dt->setTime(0,0,0); |
|
656 | + $dt->setTime(0, 0, 0); |
|
657 | 657 | $now = new DateTime(); |
658 | - $now->setTime(0,0,0); |
|
658 | + $now->setTime(0, 0, 0); |
|
659 | 659 | $diff = $dt->diff($now); |
660 | - $diffDays = (integer) $diff->format( "%R%a" ); |
|
660 | + $diffDays = (integer) $diff->format("%R%a"); |
|
661 | 661 | if ($diffDays === 0) { |
662 | 662 | // then this is most likely a time string... |
663 | 663 | if (preg_match("/^{$time}$/i", $data)) { |
@@ -666,7 +666,7 @@ discard block |
||
666 | 666 | } |
667 | 667 | if (preg_match("/^{$date}$/i", $data)) { |
668 | 668 | return self::TYPE_DATE; |
669 | - } elseif(preg_match("/^{$date} {$time}$/i")) { |
|
669 | + } elseif (preg_match("/^{$date} {$time}$/i")) { |
|
670 | 670 | return self::TYPE_DATETIME; |
671 | 671 | } |
672 | 672 | } catch (\Exception $e) { |
@@ -169,7 +169,9 @@ discard block |
||
169 | 169 | try { |
170 | 170 | list($quoteChar, $delimiter) = $this->lickQuoteAndDelim(); |
171 | 171 | } catch (TasterException $e) { |
172 | - if ($e->getCode() !== TasterException::ERR_QUOTE_AND_DELIM) throw $e; |
|
172 | + if ($e->getCode() !== TasterException::ERR_QUOTE_AND_DELIM) { |
|
173 | + throw $e; |
|
174 | + } |
|
173 | 175 | $quoteChar = '"'; |
174 | 176 | $delimiter = $this->lickDelimiter($lineTerminator); |
175 | 177 | } |
@@ -265,7 +267,9 @@ discard block |
||
265 | 267 | foreach ($patterns as $pattern) { |
266 | 268 | // @todo I had to add the error suppression char here because it was |
267 | 269 | // causing undefined offset errors with certain data sets. strange... |
268 | - if (@preg_match_all($pattern, $this->sample, $matches) && $matches) break; |
|
270 | + if (@preg_match_all($pattern, $this->sample, $matches) && $matches) { |
|
271 | + break; |
|
272 | + } |
|
269 | 273 | } |
270 | 274 | if ($matches) { |
271 | 275 | try { |
@@ -388,7 +392,9 @@ discard block |
||
388 | 392 | // if somehow we STILL can't come to a consensus, then fall back to a |
389 | 393 | // "preferred delimiters" list... |
390 | 394 | foreach ($this->delims as $key => $val) { |
391 | - if ($delim = array_search($val, $decision)) return $delim; |
|
395 | + if ($delim = array_search($val, $decision)) { |
|
396 | + return $delim; |
|
397 | + } |
|
392 | 398 | } |
393 | 399 | } |
394 | 400 | } |
@@ -431,7 +437,9 @@ discard block |
||
431 | 437 | return $delims[collect($delims)->map(function($delim) use (&$distrib, $lines) { |
432 | 438 | $linedist = collect(); |
433 | 439 | $lines->walk(function($line, $line_no) use (&$linedist, $delim) { |
434 | - if (!strlen($line)) return; |
|
440 | + if (!strlen($line)) { |
|
441 | + return; |
|
442 | + } |
|
435 | 443 | $sectstot = 10; |
436 | 444 | $sectlen = (int) (strlen($line) / $sectstot); |
437 | 445 | $sections = collect(str_split($line, $sectlen)) |
@@ -519,8 +527,12 @@ discard block |
||
519 | 527 | $quoting_styles = $quoting_styles->filter(function($val) { return (bool) $val; }); |
520 | 528 | // if quoting_styles still has QUOTE_ALL or QUOTE_NONE, then return |
521 | 529 | // whichever of them it is, we don't need to do anything else |
522 | - if ($quoting_styles->has(Flavor::QUOTE_ALL)) return Flavor::QUOTE_ALL; |
|
523 | - if ($quoting_styles->has(Flavor::QUOTE_NONE)) return Flavor::QUOTE_NONE; |
|
530 | + if ($quoting_styles->has(Flavor::QUOTE_ALL)) { |
|
531 | + return Flavor::QUOTE_ALL; |
|
532 | + } |
|
533 | + if ($quoting_styles->has(Flavor::QUOTE_NONE)) { |
|
534 | + return Flavor::QUOTE_NONE; |
|
535 | + } |
|
524 | 536 | if (count($types) == 1) { |
525 | 537 | $style = $types->getValueAtPosition(0); |
526 | 538 | if ($quoting_styles->has($style)) { |
@@ -537,7 +549,9 @@ discard block |
||
537 | 549 | if ($most = $counts->max()) { |
538 | 550 | $least = $counts->min(); |
539 | 551 | $err_margin = $least / $most; |
540 | - if ($err_margin < 1) return Flavor::QUOTE_NONNUMERIC; |
|
552 | + if ($err_margin < 1) { |
|
553 | + return Flavor::QUOTE_NONNUMERIC; |
|
554 | + } |
|
541 | 555 | } |
542 | 556 | } |
543 | 557 | } |
@@ -712,7 +726,9 @@ discard block |
||
712 | 726 | $field = str_replace(self::PLACEHOLDER_DELIM, $delim, $field); |
713 | 727 | // @todo Need a Collection::setTableField($x, $y) method |
714 | 728 | // See notes in green binder about refactoring Collection |
715 | - if (!$types->has($line_no)) $types->set($line_no, collect()); |
|
729 | + if (!$types->has($line_no)) { |
|
730 | + $types->set($line_no, collect()); |
|
731 | + } |
|
716 | 732 | $types->get($line_no)->set($colpos, [ |
717 | 733 | 'type' => $this->lickType($this->unQuote($field)), |
718 | 734 | 'length' => strlen($field) |
@@ -735,12 +751,18 @@ discard block |
||
735 | 751 | extract($possibleHeader->get($col_no, null, true), EXTR_PREFIX_ALL, "header"); |
736 | 752 | if ($header_type == self::TYPE_STRING) { |
737 | 753 | // use length |
738 | - if ($length != $header_length) $hasHeader++; |
|
739 | - else $hasHeader--; |
|
754 | + if ($length != $header_length) { |
|
755 | + $hasHeader++; |
|
756 | + } else { |
|
757 | + $hasHeader--; |
|
758 | + } |
|
740 | 759 | } else { |
741 | 760 | // use data type |
742 | - if ($type != $header_type) $hasHeader++; |
|
743 | - else $hasHeader--; |
|
761 | + if ($type != $header_type) { |
|
762 | + $hasHeader++; |
|
763 | + } else { |
|
764 | + $hasHeader--; |
|
765 | + } |
|
744 | 766 | } |
745 | 767 | } catch (OutOfBoundsException $e) { |
746 | 768 | // failure... |
@@ -562,7 +562,7 @@ |
||
562 | 562 | * Determine whether a particular string of data has quotes around it. |
563 | 563 | * |
564 | 564 | * @param string $data The data to check |
565 | - * @return boolean Whether the data is quoted or not |
|
565 | + * @return integer Whether the data is quoted or not |
|
566 | 566 | */ |
567 | 567 | protected function isQuoted($data) |
568 | 568 | { |
@@ -292,20 +292,20 @@ discard block |
||
292 | 292 | throw new TasterException("quoteChar and delimiter cannot be determined", TasterException::ERR_QUOTE_AND_DELIM); |
293 | 293 | } |
294 | 294 | |
295 | - /** |
|
296 | - * Take a list of likely delimiter characters and find the one that occurs |
|
297 | - * the most consistent amount of times within the provided data. |
|
298 | - * |
|
299 | - * @param string $eol The character(s) used for newlines |
|
300 | - * @return string One of four Flavor::QUOTING_* constants |
|
301 | - * @see Flavor for possible quote style constants |
|
302 | - * @todo Refactor this method--It needs more thorough testing against a wider |
|
303 | - * variety of CSV data to be sure it works reliably. And I'm sure there |
|
304 | - * are many performance and logic improvements that could be made. This |
|
305 | - * is essentially a first draft. |
|
306 | - * @todo Can't use replaceQuotedSpecialChars rather than removeQuotedStrings |
|
307 | - * because the former requires u to know the delimiter |
|
308 | - */ |
|
295 | + /** |
|
296 | + * Take a list of likely delimiter characters and find the one that occurs |
|
297 | + * the most consistent amount of times within the provided data. |
|
298 | + * |
|
299 | + * @param string $eol The character(s) used for newlines |
|
300 | + * @return string One of four Flavor::QUOTING_* constants |
|
301 | + * @see Flavor for possible quote style constants |
|
302 | + * @todo Refactor this method--It needs more thorough testing against a wider |
|
303 | + * variety of CSV data to be sure it works reliably. And I'm sure there |
|
304 | + * are many performance and logic improvements that could be made. This |
|
305 | + * is essentially a first draft. |
|
306 | + * @todo Can't use replaceQuotedSpecialChars rather than removeQuotedStrings |
|
307 | + * because the former requires u to know the delimiter |
|
308 | + */ |
|
309 | 309 | protected function lickDelimiter($eol = "\n") |
310 | 310 | { |
311 | 311 | $frequencies = []; |
@@ -382,16 +382,16 @@ discard block |
||
382 | 382 | * which one has the best distribution, return that one. |
383 | 383 | */ |
384 | 384 | |
385 | - $decision = $dups->get($max); |
|
386 | - try { |
|
387 | - return $this->guessDelimByDistribution($decision, $eol); |
|
388 | - } catch (TasterException $e) { |
|
389 | - // if somehow we STILL can't come to a consensus, then fall back to a |
|
390 | - // "preferred delimiters" list... |
|
391 | - foreach ($this->delims as $key => $val) { |
|
385 | + $decision = $dups->get($max); |
|
386 | + try { |
|
387 | + return $this->guessDelimByDistribution($decision, $eol); |
|
388 | + } catch (TasterException $e) { |
|
389 | + // if somehow we STILL can't come to a consensus, then fall back to a |
|
390 | + // "preferred delimiters" list... |
|
391 | + foreach ($this->delims as $key => $val) { |
|
392 | 392 | if ($delim = array_search($val, $decision)) return $delim; |
393 | - } |
|
394 | - } |
|
393 | + } |
|
394 | + } |
|
395 | 395 | } |
396 | 396 | return $delims |
397 | 397 | ->sort() |
@@ -450,8 +450,8 @@ discard block |
||
450 | 450 | })->map(function($dists) { |
451 | 451 | return $dists->average(); |
452 | 452 | })->sort() |
453 | - ->reverse() |
|
454 | - ->getKeyAtPosition(0)]; |
|
453 | + ->reverse() |
|
454 | + ->getKeyAtPosition(0)]; |
|
455 | 455 | } catch (Exception $e) { |
456 | 456 | throw new TasterException("delimiter cannot be determined by distribution", TasterException::ERR_DELIMITER); |
457 | 457 | } |
@@ -68,7 +68,7 @@ |
||
68 | 68 | } elseif ($fields instanceof Iterator) { |
69 | 69 | $fields = iterator_to_array($fields); |
70 | 70 | } else { |
71 | - throw new InvalidArgumentException(__CLASS__ . " requires an array, got: " . gettype($fields)); |
|
71 | + throw new InvalidArgumentException(__CLASS__." requires an array, got: ".gettype($fields)); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | $this->fields = collect(array_values($fields)); |
@@ -152,7 +152,9 @@ |
||
152 | 152 | public function next() |
153 | 153 | { |
154 | 154 | $this->position++; |
155 | - if ($this->valid()) return $this->current(); |
|
155 | + if ($this->valid()) { |
|
156 | + return $this->current(); |
|
157 | + } |
|
156 | 158 | } |
157 | 159 | |
158 | 160 | /** |
@@ -254,7 +254,9 @@ discard block |
||
254 | 254 | $this->getContext() |
255 | 255 | ); |
256 | 256 | restore_error_handler(); |
257 | - if ($e) throw $e; |
|
257 | + if ($e) { |
|
258 | + throw $e; |
|
259 | + } |
|
258 | 260 | } |
259 | 261 | return $this->isConnected(); |
260 | 262 | } |
@@ -328,7 +330,9 @@ discard block |
||
328 | 330 | public function setMode($mode = null) |
329 | 331 | { |
330 | 332 | $this->assertNotConnected(__METHOD__); |
331 | - if (is_null($mode)) $mode = "r+b"; |
|
333 | + if (is_null($mode)) { |
|
334 | + $mode = "r+b"; |
|
335 | + } |
|
332 | 336 | |
333 | 337 | $mode = substr($mode, 0, 3); |
334 | 338 | $rest = substr($mode, 1); |
@@ -436,7 +440,9 @@ discard block |
||
436 | 440 | */ |
437 | 441 | protected function setLazy($lazy) |
438 | 442 | { |
439 | - if (is_null($lazy)) $lazy = true; |
|
443 | + if (is_null($lazy)) { |
|
444 | + $lazy = true; |
|
445 | + } |
|
440 | 446 | $this->lazy = (boolean) $lazy; |
441 | 447 | return $this; |
442 | 448 | } |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | { |
240 | 240 | if (!$this->isConnected()) { |
241 | 241 | $e = null; |
242 | - $errhandler = function () use (&$e) { |
|
242 | + $errhandler = function() use (&$e) { |
|
243 | 243 | $e = new IOException(sprintf( |
244 | 244 | "Could not open connection for %s using mode %s", |
245 | 245 | $this->getUri(), |
@@ -555,7 +555,7 @@ discard block |
||
555 | 555 | $this->updateContext(); |
556 | 556 | return $this; |
557 | 557 | } |
558 | - throw new InvalidArgumentException("Context options must be an array, got: " . gettype($options)); |
|
558 | + throw new InvalidArgumentException("Context options must be an array, got: ".gettype($options)); |
|
559 | 559 | } |
560 | 560 | |
561 | 561 | /** |
@@ -575,7 +575,7 @@ discard block |
||
575 | 575 | $this->updateContext(); |
576 | 576 | return $this; |
577 | 577 | } |
578 | - throw new InvalidArgumentException("Context parameters must be an array, got: " . gettype($params)); |
|
578 | + throw new InvalidArgumentException("Context parameters must be an array, got: ".gettype($params)); |
|
579 | 579 | } |
580 | 580 | |
581 | 581 | /** |
@@ -185,10 +185,10 @@ discard block |
||
185 | 185 | |
186 | 186 | // ok we're opening a new stream resource handle |
187 | 187 | $this->setUri($uri) |
188 | - ->setMode($mode) |
|
189 | - ->setLazy($lazy) |
|
190 | - ->setUseIncludePath($use_include_path) |
|
191 | - ->setContext($context_options, $context_params); |
|
188 | + ->setMode($mode) |
|
189 | + ->setLazy($lazy) |
|
190 | + ->setUseIncludePath($use_include_path) |
|
191 | + ->setContext($context_options, $context_params); |
|
192 | 192 | if (!$this->isLazy()) { |
193 | 193 | $this->connect(); |
194 | 194 | } |
@@ -351,9 +351,9 @@ discard block |
||
351 | 351 | |
352 | 352 | $this->flag = ''; |
353 | 353 | $this->setBaseMode($base) |
354 | - ->setIsPlus($plus == '+') |
|
355 | - ->setIsText($flag == 't') |
|
356 | - ->setIsBinary($flag == 'b'); |
|
354 | + ->setIsPlus($plus == '+') |
|
355 | + ->setIsText($flag == 't') |
|
356 | + ->setIsBinary($flag == 'b'); |
|
357 | 357 | |
358 | 358 | return $this; |
359 | 359 | } |
@@ -267,16 +267,16 @@ |
||
267 | 267 | return strlen($data); |
268 | 268 | } |
269 | 269 | |
270 | - /** |
|
271 | - * Seekability accessor. |
|
272 | - * |
|
273 | - * Despite the fact that any class that implements this interface must also |
|
274 | - * define methods such as seek, that is no guarantee that an |
|
275 | - * object will necessarily be seekable. This method should tell the user |
|
276 | - * whether a stream is, in fact, seekable. |
|
277 | - * |
|
278 | - * @return boolean True if seekable, false otherwise |
|
279 | - */ |
|
270 | + /** |
|
271 | + * Seekability accessor. |
|
272 | + * |
|
273 | + * Despite the fact that any class that implements this interface must also |
|
274 | + * define methods such as seek, that is no guarantee that an |
|
275 | + * object will necessarily be seekable. This method should tell the user |
|
276 | + * whether a stream is, in fact, seekable. |
|
277 | + * |
|
278 | + * @return boolean True if seekable, false otherwise |
|
279 | + */ |
|
280 | 280 | public function isSeekable() |
281 | 281 | { |
282 | 282 | return $this->seekable; |
@@ -138,7 +138,9 @@ |
||
138 | 138 | public function readChunk($start = null, $length = null) |
139 | 139 | { |
140 | 140 | //dd($this->buffer, false); |
141 | - if ($this->buffer === false) return false; |
|
141 | + if ($this->buffer === false) { |
|
142 | + return false; |
|
143 | + } |
|
142 | 144 | $top = substr($this->buffer, 0, $start); |
143 | 145 | $data = substr($this->buffer, $start, $length); |
144 | 146 | $bottom = substr($this->buffer, $start + $length); |
@@ -136,7 +136,9 @@ discard block |
||
136 | 136 | { |
137 | 137 | $resource = (new Resource($uri, $mode)) |
138 | 138 | ->setContextResource($context); |
139 | - if (!$lazy) $resource->connect(); |
|
139 | + if (!$lazy) { |
|
140 | + $resource->connect(); |
|
141 | + } |
|
140 | 142 | return new self($resource); |
141 | 143 | } |
142 | 144 | |
@@ -169,7 +171,9 @@ discard block |
||
169 | 171 | } |
170 | 172 | // if a certain value was requested, return it |
171 | 173 | // otherwise, return entire array |
172 | - if (is_null($key)) return $this->meta; |
|
174 | + if (is_null($key)) { |
|
175 | + return $this->meta; |
|
176 | + } |
|
173 | 177 | return (array_key_exists($key, $this->meta)) ? $this->meta[$key] : null; |
174 | 178 | } |
175 | 179 | } |
@@ -315,7 +319,9 @@ discard block |
||
315 | 319 | public function read($length) |
316 | 320 | { |
317 | 321 | $this->assertIsReadable(); |
318 | - if ($this->eof()) return false; |
|
322 | + if ($this->eof()) { |
|
323 | + return false; |
|
324 | + } |
|
319 | 325 | return fread($this->resource->getHandle(), $length); |
320 | 326 | } |
321 | 327 |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | public function toArray() |
195 | 195 | { |
196 | 196 | $data = []; |
197 | - foreach($this->data as $key => $val) { |
|
197 | + foreach ($this->data as $key => $val) { |
|
198 | 198 | $data[$key] = (is_object($val) && method_exists($val, 'toArray')) ? $val->toArray() : $val; |
199 | 199 | } |
200 | 200 | return $data; |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | if ($i === $pos) return $key; |
370 | 370 | $i++; |
371 | 371 | } |
372 | - throw new OutOfBoundsException("Collection data does not contain a key at given position: " . $pos); |
|
372 | + throw new OutOfBoundsException("Collection data does not contain a key at given position: ".$pos); |
|
373 | 373 | } |
374 | 374 | |
375 | 375 | /** |
@@ -554,7 +554,7 @@ discard block |
||
554 | 554 | return $this->data[$key]; |
555 | 555 | } else { |
556 | 556 | if ($throwExc) { |
557 | - throw new OutOfBoundsException("Collection data does not contain value for given key: " . $key); |
|
557 | + throw new OutOfBoundsException("Collection data does not contain value for given key: ".$key); |
|
558 | 558 | } |
559 | 559 | } |
560 | 560 | return $default; |
@@ -899,7 +899,7 @@ discard block |
||
899 | 899 | public function pairs($alt = false) |
900 | 900 | { |
901 | 901 | return new self(array_map( |
902 | - function ($key, $val) use ($alt) { |
|
902 | + function($key, $val) use ($alt) { |
|
903 | 903 | if ($alt) { |
904 | 904 | return [$key => $val]; |
905 | 905 | } else { |
@@ -981,7 +981,7 @@ discard block |
||
981 | 981 | if (false !== ($condRet = $this->if2DMapInternalMethod(__METHOD__))) { |
982 | 982 | return $condRet; |
983 | 983 | } |
984 | - $strvals = $this->map(function($val){ |
|
984 | + $strvals = $this->map(function($val) { |
|
985 | 985 | return (string) $val; |
986 | 986 | }); |
987 | 987 | $this->assertNumericValues(); |
@@ -1095,7 +1095,7 @@ discard block |
||
1095 | 1095 | $this->assertIsTabular(); |
1096 | 1096 | return $this->sort(function($a, $b) use ($key, $cmp) { |
1097 | 1097 | if (!isset($a[$key]) || !isset($b[$key])) { |
1098 | - throw new RuntimeException('Cannot order collection by non-existant key: ' . $key); |
|
1098 | + throw new RuntimeException('Cannot order collection by non-existant key: '.$key); |
|
1099 | 1099 | } |
1100 | 1100 | if (is_null($cmp)) { |
1101 | 1101 | return strcasecmp($a[$key], $b[$key]); |
@@ -1142,7 +1142,7 @@ discard block |
||
1142 | 1142 | */ |
1143 | 1143 | public function is2D() |
1144 | 1144 | { |
1145 | - return !$this->contains(function($val){ |
|
1145 | + return !$this->contains(function($val) { |
|
1146 | 1146 | return !is_array($val); |
1147 | 1147 | }); |
1148 | 1148 | return false; |
@@ -1212,7 +1212,7 @@ discard block |
||
1212 | 1212 | |
1213 | 1213 | protected function assertNumericValues() |
1214 | 1214 | { |
1215 | - if ($this->contains(function($val){ |
|
1215 | + if ($this->contains(function($val) { |
|
1216 | 1216 | return !is_numeric($val); |
1217 | 1217 | })) { |
1218 | 1218 | // can't average non-numeric data |
@@ -1228,6 +1228,6 @@ discard block |
||
1228 | 1228 | if (is_null($data) || is_array($data) || $data instanceof Iterator) { |
1229 | 1229 | return; |
1230 | 1230 | } |
1231 | - throw new InvalidArgumentException("Invalid type for collection data: " . gettype($data)); |
|
1231 | + throw new InvalidArgumentException("Invalid type for collection data: ".gettype($data)); |
|
1232 | 1232 | } |
1233 | 1233 | } |
@@ -153,8 +153,9 @@ discard block |
||
153 | 153 | } |
154 | 154 | } else { |
155 | 155 | if (is_null($key)) { |
156 | - if (is_array($val)) return $this->merge($val); |
|
157 | - else { |
|
156 | + if (is_array($val)) { |
|
157 | + return $this->merge($val); |
|
158 | + } else { |
|
158 | 159 | if (is_callable($val)) { |
159 | 160 | return $this->map($val); |
160 | 161 | } /*else { |
@@ -248,7 +249,9 @@ discard block |
||
248 | 249 | { |
249 | 250 | if (is_callable($callback = $val)) { |
250 | 251 | foreach ($this->data as $key => $val) { |
251 | - if ($callback($val, $key)) return true; |
|
252 | + if ($callback($val, $key)) { |
|
253 | + return true; |
|
254 | + } |
|
252 | 255 | } |
253 | 256 | } elseif (in_array($val, $this->data)) { |
254 | 257 | return (is_null($key) || (isset($this->data[$key]) && $this->data[$key] == $val)); |
@@ -366,7 +369,9 @@ discard block |
||
366 | 369 | { |
367 | 370 | $i = 0; |
368 | 371 | foreach ($this->data as $key => $val) { |
369 | - if ($i === $pos) return $key; |
|
372 | + if ($i === $pos) { |
|
373 | + return $key; |
|
374 | + } |
|
370 | 375 | $i++; |
371 | 376 | } |
372 | 377 | throw new OutOfBoundsException("Collection data does not contain a key at given position: " . $pos); |
@@ -744,7 +749,9 @@ discard block |
||
744 | 749 | { |
745 | 750 | foreach ($this->data as $key => $val) { |
746 | 751 | if (!$ret = $callback($val, $key)) { |
747 | - if ($ret === false) break; |
|
752 | + if ($ret === false) { |
|
753 | + break; |
|
754 | + } |
|
748 | 755 | } |
749 | 756 | } |
750 | 757 | return $this; |
@@ -776,7 +783,9 @@ discard block |
||
776 | 783 | { |
777 | 784 | $keys = []; |
778 | 785 | foreach ($this->data as $key => $val) { |
779 | - if (false === $callback($val, $key)) $keys[$key] = true; |
|
786 | + if (false === $callback($val, $key)) { |
|
787 | + $keys[$key] = true; |
|
788 | + } |
|
780 | 789 | } |
781 | 790 | return new self(array_diff_key($this->data, $keys)); |
782 | 791 | } |
@@ -793,7 +802,9 @@ discard block |
||
793 | 802 | public function first(Callable $callback) |
794 | 803 | { |
795 | 804 | foreach ($this->data as $key => $val) { |
796 | - if ($callback($val, $key)) return $val; |
|
805 | + if ($callback($val, $key)) { |
|
806 | + return $val; |
|
807 | + } |
|
797 | 808 | } |
798 | 809 | return null; |
799 | 810 | } |
@@ -811,7 +822,9 @@ discard block |
||
811 | 822 | { |
812 | 823 | $elem = null; |
813 | 824 | foreach ($this->data as $key => $val) { |
814 | - if ($callback($val, $key)) $elem = $val; |
|
825 | + if ($callback($val, $key)) { |
|
826 | + $elem = $val; |
|
827 | + } |
|
815 | 828 | } |
816 | 829 | return $elem; |
817 | 830 | } |
@@ -1062,7 +1075,9 @@ discard block |
||
1062 | 1075 | */ |
1063 | 1076 | public function sort(Callable $callback = null, $preserve_keys = true) |
1064 | 1077 | { |
1065 | - if (is_null($callback)) $callback = 'strcasecmp'; |
|
1078 | + if (is_null($callback)) { |
|
1079 | + $callback = 'strcasecmp'; |
|
1080 | + } |
|
1066 | 1081 | if (!is_callable($callback)) { |
1067 | 1082 | throw new InvalidArgumentException(sprintf( |
1068 | 1083 | 'Invalid argument supplied for %s. Expected %s, got: "%s".', |
@@ -1172,7 +1187,9 @@ discard block |
||
1172 | 1187 | |
1173 | 1188 | // if the list of array keys is shorter than the total amount of items in |
1174 | 1189 | // the collection, than this is not tabular data |
1175 | - if (count($test) != count($this)) return false; |
|
1190 | + if (count($test) != count($this)) { |
|
1191 | + return false; |
|
1192 | + } |
|
1176 | 1193 | |
1177 | 1194 | // loop through the array of each item's array keys that we just created |
1178 | 1195 | // and compare it to the FIRST item. If any array contains different keys |
@@ -1180,7 +1197,9 @@ discard block |
||
1180 | 1197 | $first = array_shift($test); |
1181 | 1198 | foreach ($test as $key => $keys) { |
1182 | 1199 | $diff = array_diff($first, $keys); |
1183 | - if (!empty($diff)) return false; |
|
1200 | + if (!empty($diff)) { |
|
1201 | + return false; |
|
1202 | + } |
|
1184 | 1203 | } |
1185 | 1204 | return true; |
1186 | 1205 | } |
@@ -267,16 +267,16 @@ |
||
267 | 267 | return strlen($data); |
268 | 268 | } |
269 | 269 | |
270 | - /** |
|
271 | - * Seekability accessor. |
|
272 | - * |
|
273 | - * Despite the fact that any class that implements this interface must also |
|
274 | - * define methods such as seek, that is no guarantee that an |
|
275 | - * object will necessarily be seekable. This method should tell the user |
|
276 | - * whether a stream is, in fact, seekable. |
|
277 | - * |
|
278 | - * @return boolean True if seekable, false otherwise |
|
279 | - */ |
|
270 | + /** |
|
271 | + * Seekability accessor. |
|
272 | + * |
|
273 | + * Despite the fact that any class that implements this interface must also |
|
274 | + * define methods such as seek, that is no guarantee that an |
|
275 | + * object will necessarily be seekable. This method should tell the user |
|
276 | + * whether a stream is, in fact, seekable. |
|
277 | + * |
|
278 | + * @return boolean True if seekable, false otherwise |
|
279 | + */ |
|
280 | 280 | public function isSeekable() |
281 | 281 | { |
282 | 282 | return $this->seekable; |