@@ -16,14 +16,11 @@ |
||
| 16 | 16 | use CSVelte\Traits\IsReadable; |
| 17 | 17 | use CSVelte\Traits\IsWritable; |
| 18 | 18 | use CSVelte\Traits\IsSeekable; |
| 19 | - |
|
| 20 | 19 | use CSVelte\Contract\Readable; |
| 21 | 20 | use CSVelte\Contract\Writable; |
| 22 | 21 | use CSVelte\Contract\Seekable; |
| 23 | 22 | |
| 24 | 23 | use \InvalidArgumentException; |
| 25 | -use CSVelte\Exception\NotYetImplementedException; |
|
| 26 | -use CSVelte\Exception\EndOfFileException; |
|
| 27 | 24 | use CSVelte\Exception\IOException; |
| 28 | 25 | |
| 29 | 26 | /** |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * likely buffer the output so that this may be called after writeRows() |
| 91 | 91 | * |
| 92 | 92 | * @param \Iterator|array A list of header values |
| 93 | - * @return boolean |
|
| 93 | + * @return boolean|null |
|
| 94 | 94 | * @throws \CSVelte\Exception\WriterException |
| 95 | 95 | */ |
| 96 | 96 | public function setHeaderRow($headers) |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | * This means taking an array of data, and converting it to a Row object |
| 162 | 162 | * |
| 163 | 163 | * @param \Iterator|array of data items |
| 164 | - * @return CSVelte\Table\AbstractRow |
|
| 164 | + * @return Row |
|
| 165 | 165 | * @access protected |
| 166 | 166 | */ |
| 167 | 167 | protected function prepareRow(Iterator $row) |
@@ -189,6 +189,9 @@ discard block |
||
| 189 | 189 | return $this->quoteString($data); |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | + /** |
|
| 193 | + * @param string $str |
|
| 194 | + */ |
|
| 192 | 195 | protected function quoteString($str) |
| 193 | 196 | { |
| 194 | 197 | $flvr = $this->getFlavor(); |
@@ -165,6 +165,7 @@ discard block |
||
| 165 | 165 | * replaceQuotedSpecialChars method which (at least to me) makes more sense. |
| 166 | 166 | * |
| 167 | 167 | * @param string The string to replace quoted strings within |
| 168 | + * @param string $data |
|
| 168 | 169 | * @return string The input string with quoted strings removed |
| 169 | 170 | * @access protected |
| 170 | 171 | * @todo Replace code that uses this method with the replaceQuotedSpecialChars |
@@ -414,7 +415,7 @@ discard block |
||
| 414 | 415 | * Determine whether a particular string of data has quotes around it. |
| 415 | 416 | * |
| 416 | 417 | * @param string The data to check |
| 417 | - * @return boolean Whether the data is quoted or not |
|
| 418 | + * @return integer Whether the data is quoted or not |
|
| 418 | 419 | * @access protected |
| 419 | 420 | */ |
| 420 | 421 | protected function isQuoted($data) |
@@ -464,6 +465,8 @@ discard block |
||
| 464 | 465 | * |
| 465 | 466 | * @param string The string to do the replacements on |
| 466 | 467 | * @param string The delimiter character to replace |
| 468 | + * @param string $data |
|
| 469 | + * @param string $delim |
|
| 467 | 470 | * @return string The data with replacements performed |
| 468 | 471 | * @access protected |
| 469 | 472 | * @todo I could probably pass in (maybe optionally) the newline character I |
@@ -490,6 +493,7 @@ discard block |
||
| 490 | 493 | * to be practical. |
| 491 | 494 | * |
| 492 | 495 | * @param string The string of data to check the type of |
| 496 | + * @param string $data |
|
| 493 | 497 | * @return string One of the TYPE_ string constants above |
| 494 | 498 | * @access protected |
| 495 | 499 | * @uses \Carbon\Carbon date/time ilbrary/class |
@@ -546,6 +550,7 @@ discard block |
||
| 546 | 550 | * @param string $delim The CSV data's delimiting char (can be a variety of chars but) |
| 547 | 551 | * typically $eol is either a comma or a tab, sometimes a pipe) |
| 548 | 552 | * @param string The CSV data's end-of-line char(s) (\n \r or \r\n) |
| 553 | + * @param string $eol |
|
| 549 | 554 | * @return boolean True if the data (most likely) contains a header row |
| 550 | 555 | * @access public |
| 551 | 556 | * @todo This method needs a total refactor. It's not necessary to loop twice |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | * accept any string (or any object with a __toString() method), or an |
| 128 | 128 | * SplFileObject, so long as it represents a file rather than a directory. |
| 129 | 129 | * |
| 130 | - * @param \CSVelte\Contract\Readable|object|string|SplFileObject $input See description |
|
| 130 | + * @param Readable $input See description |
|
| 131 | 131 | * @return $this |
| 132 | 132 | */ |
| 133 | 133 | protected function setSource($input) |
@@ -328,6 +328,9 @@ discard block |
||
| 328 | 328 | * @todo This actually shouldn't even be necessary. Characters should be read |
| 329 | 329 | * in one at a time and a quote that follows another should just be ignored |
| 330 | 330 | * deeming this unnecessary. |
| 331 | + * @param string $str |
|
| 332 | + * @param string $esc |
|
| 333 | + * @param string $quo |
|
| 331 | 334 | */ |
| 332 | 335 | protected function unEscape($str, $esc, $quo) |
| 333 | 336 | { |
@@ -338,6 +341,7 @@ discard block |
||
| 338 | 341 | * Parse a line of CSV data into an array of columns |
| 339 | 342 | * |
| 340 | 343 | * @param string A line of CSV data to parse |
| 344 | + * @param string $line |
|
| 341 | 345 | * @return array An array of columns |
| 342 | 346 | * @access protected |
| 343 | 347 | * @internal |
@@ -417,7 +421,7 @@ discard block |
||
| 417 | 421 | /** |
| 418 | 422 | * Retrieve header row. |
| 419 | 423 | * |
| 420 | - * @return CSVelte\Table\HeaderRow|null The header row if there is one |
|
| 424 | + * @return HeaderRow The header row if there is one |
|
| 421 | 425 | */ |
| 422 | 426 | public function header() |
| 423 | 427 | { |
@@ -458,7 +462,7 @@ discard block |
||
| 458 | 462 | /** |
| 459 | 463 | * Returns an iterator with rows from user-supplied filter functions removed |
| 460 | 464 | * |
| 461 | - * @return CSVelte\Reader\FilteredReader An iterator with filtered rows |
|
| 465 | + * @return FilteredReader An iterator with filtered rows |
|
| 462 | 466 | */ |
| 463 | 467 | public function filter() |
| 464 | 468 | { |