@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | * |
220 | 220 | * Creates and returns a Stream object for this resource |
221 | 221 | * |
222 | - * @return resource The underlying stream resource |
|
222 | + * @return Stream The underlying stream resource |
|
223 | 223 | */ |
224 | 224 | public function __invoke() |
225 | 225 | { |
@@ -432,6 +432,7 @@ discard block |
||
432 | 432 | * until the user specifically requests it. |
433 | 433 | * |
434 | 434 | * @param boolean|null Whether or not to "lazily" open the stream |
435 | + * @param boolean|null $lazy |
|
435 | 436 | * @return $this |
436 | 437 | */ |
437 | 438 | protected function setLazy($lazy) |
@@ -841,6 +842,7 @@ discard block |
||
841 | 842 | * only be called on unopened stream resources. |
842 | 843 | * |
843 | 844 | * @param string The method that is asserting |
845 | + * @param string $method |
|
844 | 846 | * @return void |
845 | 847 | * @throws \CSVelte\Exception\IOException if stream is open |
846 | 848 | */ |
@@ -857,6 +859,7 @@ discard block |
||
857 | 859 | * Used internally to ensure that a given stream wrapper is valid and available |
858 | 860 | * |
859 | 861 | * @param string The name of the stream wrapper |
862 | + * @param string $name |
|
860 | 863 | * @return void |
861 | 864 | * @throws \InvalidArgumentException if wrapper doesn't exist |
862 | 865 | */ |
@@ -190,17 +190,17 @@ discard block |
||
190 | 190 | // set all this manually |
191 | 191 | $meta = stream_get_meta_data($handle); |
192 | 192 | $this->setUri($meta['uri']) |
193 | - ->setMode($meta['mode']); |
|
193 | + ->setMode($meta['mode']); |
|
194 | 194 | $this->conn = $handle; |
195 | 195 | return; |
196 | 196 | } |
197 | 197 | |
198 | 198 | // ok we're opening a new stream resource handle |
199 | 199 | $this->setUri($uri) |
200 | - ->setMode($mode) |
|
201 | - ->setLazy($lazy) |
|
202 | - ->setUseIncludePath($use_include_path) |
|
203 | - ->setContext($context_options, $context_params); |
|
200 | + ->setMode($mode) |
|
201 | + ->setLazy($lazy) |
|
202 | + ->setUseIncludePath($use_include_path) |
|
203 | + ->setContext($context_options, $context_params); |
|
204 | 204 | if (!$this->isLazy()) { |
205 | 205 | $this->connect(); |
206 | 206 | } |
@@ -339,9 +339,9 @@ discard block |
||
339 | 339 | |
340 | 340 | $this->flag = ''; |
341 | 341 | $this->setBaseMode($base) |
342 | - ->setIsPlus($plus == '+') |
|
343 | - ->setIsText($flag == 't') |
|
344 | - ->setIsBinary($flag == 'b'); |
|
342 | + ->setIsPlus($plus == '+') |
|
343 | + ->setIsText($flag == 't') |
|
344 | + ->setIsBinary($flag == 'b'); |
|
345 | 345 | |
346 | 346 | return $this; |
347 | 347 | } |
@@ -131,6 +131,7 @@ discard block |
||
131 | 131 | * |
132 | 132 | * @see http://php.net/manual/en/function.fopen.php |
133 | 133 | * @see http://php.net/manual/en/function.stream-context-create.php |
134 | + * @param string $mode |
|
134 | 135 | */ |
135 | 136 | public static function open($uri, $mode = null, $context = null, $lazy = false) |
136 | 137 | { |
@@ -143,7 +144,7 @@ discard block |
||
143 | 144 | /** |
144 | 145 | * Close stream resource. |
145 | 146 | * |
146 | - * @return boolean True on success or false on failure |
|
147 | + * @return boolean|null True on success or false on failure |
|
147 | 148 | */ |
148 | 149 | public function close() |
149 | 150 | { |
@@ -224,7 +225,7 @@ discard block |
||
224 | 225 | * |
225 | 226 | * Returns the internal stream resource pointer |
226 | 227 | * |
227 | - * @return resource The open stream resource pointer |
|
228 | + * @return Resource The open stream resource pointer |
|
228 | 229 | */ |
229 | 230 | public function getResource() |
230 | 231 | { |
@@ -262,7 +263,7 @@ discard block |
||
262 | 263 | * |
263 | 264 | * After the stream has been detached, the stream is in an unusable state. |
264 | 265 | * |
265 | - * @return resource|null Underlying PHP stream, if any |
|
266 | + * @return Resource Underlying PHP stream, if any |
|
266 | 267 | */ |
267 | 268 | public function detach() |
268 | 269 | { |
@@ -189,6 +189,7 @@ discard block |
||
189 | 189 | * replaceQuotedSpecialChars method which (at least to me) makes more sense. |
190 | 190 | * |
191 | 191 | * @param string The string to replace quoted strings within |
192 | + * @param string $data |
|
192 | 193 | * @return string The input string with quoted strings removed |
193 | 194 | * @todo Replace code that uses this method with the replaceQuotedSpecialChars |
194 | 195 | * method instead. I think it's cleaner. |
@@ -559,7 +560,7 @@ discard block |
||
559 | 560 | * Determine whether a particular string of data has quotes around it. |
560 | 561 | * |
561 | 562 | * @param string The data to check |
562 | - * @return boolean Whether the data is quoted or not |
|
563 | + * @return integer Whether the data is quoted or not |
|
563 | 564 | */ |
564 | 565 | protected function isQuoted($data) |
565 | 566 | { |
@@ -607,6 +608,8 @@ discard block |
||
607 | 608 | * |
608 | 609 | * @param string The string to do the replacements on |
609 | 610 | * @param string The delimiter character to replace |
611 | + * @param string $data |
|
612 | + * @param string $delim |
|
610 | 613 | * @return string The data with replacements performed |
611 | 614 | * @todo I could probably pass in (maybe optionally) the newline character I |
612 | 615 | * want to replace as well. I'll do that if I need to. |
@@ -632,6 +635,7 @@ discard block |
||
632 | 635 | * to be practical. |
633 | 636 | * |
634 | 637 | * @param string The string of data to check the type of |
638 | + * @param string $data |
|
635 | 639 | * @return string One of the TYPE_ string constants above |
636 | 640 | */ |
637 | 641 | protected function lickType($data) |
@@ -290,20 +290,20 @@ discard block |
||
290 | 290 | throw new TasterException("quoteChar and delimiter cannot be determined", TasterException::ERR_QUOTE_AND_DELIM); |
291 | 291 | } |
292 | 292 | |
293 | - /** |
|
294 | - * Take a list of likely delimiter characters and find the one that occurs |
|
295 | - * the most consistent amount of times within the provided data. |
|
296 | - * |
|
297 | - * @param string The character(s) used for newlines |
|
298 | - * @return string One of four Flavor::QUOTING_* constants |
|
299 | - * @see \CSVelte\Flavor for possible quote style constants |
|
300 | - * @todo Refactor this method--It needs more thorough testing against a wider |
|
301 | - * variety of CSV data to be sure it works reliably. And I'm sure there |
|
302 | - * are many performance and logic improvements that could be made. This |
|
303 | - * is essentially a first draft. |
|
304 | - * @todo Can't use replaceQuotedSpecialChars rather than removeQuotedStrings |
|
305 | - * because the former requires u to know the delimiter |
|
306 | - */ |
|
293 | + /** |
|
294 | + * Take a list of likely delimiter characters and find the one that occurs |
|
295 | + * the most consistent amount of times within the provided data. |
|
296 | + * |
|
297 | + * @param string The character(s) used for newlines |
|
298 | + * @return string One of four Flavor::QUOTING_* constants |
|
299 | + * @see \CSVelte\Flavor for possible quote style constants |
|
300 | + * @todo Refactor this method--It needs more thorough testing against a wider |
|
301 | + * variety of CSV data to be sure it works reliably. And I'm sure there |
|
302 | + * are many performance and logic improvements that could be made. This |
|
303 | + * is essentially a first draft. |
|
304 | + * @todo Can't use replaceQuotedSpecialChars rather than removeQuotedStrings |
|
305 | + * because the former requires u to know the delimiter |
|
306 | + */ |
|
307 | 307 | protected function lickDelimiter($eol = "\n") |
308 | 308 | { |
309 | 309 | $frequencies = []; |
@@ -380,16 +380,16 @@ discard block |
||
380 | 380 | * which one has the best distribution, return that one. |
381 | 381 | */ |
382 | 382 | |
383 | - $decision = $dups->get($max); |
|
384 | - try { |
|
385 | - return $this->guessDelimByDistribution($decision, $eol); |
|
386 | - } catch (TasterException $e) { |
|
387 | - // if somehow we STILL can't come to a consensus, then fall back to a |
|
388 | - // "preferred delimiters" list... |
|
389 | - foreach ($this->delims as $key => $val) { |
|
383 | + $decision = $dups->get($max); |
|
384 | + try { |
|
385 | + return $this->guessDelimByDistribution($decision, $eol); |
|
386 | + } catch (TasterException $e) { |
|
387 | + // if somehow we STILL can't come to a consensus, then fall back to a |
|
388 | + // "preferred delimiters" list... |
|
389 | + foreach ($this->delims as $key => $val) { |
|
390 | 390 | if ($delim = array_search($val, $decision)) return $delim; |
391 | - } |
|
392 | - } |
|
391 | + } |
|
392 | + } |
|
393 | 393 | } |
394 | 394 | return $delims |
395 | 395 | ->sort() |
@@ -446,8 +446,8 @@ discard block |
||
446 | 446 | })->map(function($dists) { |
447 | 447 | return $dists->average(); |
448 | 448 | })->sort() |
449 | - ->reverse() |
|
450 | - ->getKeyAtPosition(0)]; |
|
449 | + ->reverse() |
|
450 | + ->getKeyAtPosition(0)]; |
|
451 | 451 | } catch (Exception $e) { |
452 | 452 | throw new TasterException("delimiter cannot be determined by distribution", TasterException::ERR_DELIMITER); |
453 | 453 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | /** |
61 | 61 | * Class Constructor |
62 | 62 | * |
63 | - * @param \CSVelte\Contract\Writable $output An output source to write to |
|
63 | + * @param Streamable $output An output source to write to |
|
64 | 64 | * @param \CSVelte\Flavor|array $flavor A flavor or set of formatting params |
65 | 65 | */ |
66 | 66 | public function __construct(Streamable $output, $flavor = null) |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * likely buffer the output so that this may be called after writeRows() |
90 | 90 | * |
91 | 91 | * @param \Iterator|array A list of header values |
92 | - * @return boolean |
|
92 | + * @return boolean|null |
|
93 | 93 | * @throws \CSVelte\Exception\WriterException |
94 | 94 | */ |
95 | 95 | public function setHeaderRow($headers) |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * This means taking an array of data, and converting it to a Row object |
160 | 160 | * |
161 | 161 | * @param \Iterator|array of data items |
162 | - * @return CSVelte\Table\AbstractRow |
|
162 | + * @return Row |
|
163 | 163 | * @access protected |
164 | 164 | */ |
165 | 165 | protected function prepareRow(Iterator $row) |
@@ -187,6 +187,9 @@ discard block |
||
187 | 187 | return $this->quoteString($data); |
188 | 188 | } |
189 | 189 | |
190 | + /** |
|
191 | + * @param string $str |
|
192 | + */ |
|
190 | 193 | protected function quoteString($str) |
191 | 194 | { |
192 | 195 | $flvr = $this->getFlavor(); |
@@ -56,7 +56,7 @@ |
||
56 | 56 | public function __construct($fields) |
57 | 57 | { |
58 | 58 | $this->setFields($fields) |
59 | - ->rewind(); |
|
59 | + ->rewind(); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | protected function setFields($fields) |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | /** |
133 | 133 | * Get the current key (column number or header, if available) |
134 | 134 | * |
135 | - * @return string The "current" key |
|
135 | + * @return integer The "current" key |
|
136 | 136 | * @access public |
137 | 137 | * @todo Figure out if this can return a CSVelte\Table\HeaderData object so long as it |
138 | 138 | * has a __toString() method that generated the right key... |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | * Advance the internal pointer to the next column's data object |
147 | 147 | * Also returns the next column's data object if there is one |
148 | 148 | * |
149 | - * @return CSVelte\Table\Data The "next" column's data |
|
149 | + * @return string|null The "next" column's data |
|
150 | 150 | * @access public |
151 | 151 | */ |
152 | 152 | public function next() |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | /** |
159 | 159 | * Return the internal pointer to the first column and return that object |
160 | 160 | * |
161 | - * @return null|AbstractRow |
|
161 | + * @return string|null |
|
162 | 162 | */ |
163 | 163 | public function rewind() |
164 | 164 | { |
@@ -91,8 +91,8 @@ |
||
91 | 91 | public function __construct($input, $flavor = null) |
92 | 92 | { |
93 | 93 | $this->setSource($input) |
94 | - ->setFlavor($flavor) |
|
95 | - ->rewind(); |
|
94 | + ->setFlavor($flavor) |
|
95 | + ->rewind(); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -19,7 +19,6 @@ |
||
19 | 19 | if (if $file->hasHeader()) { |
20 | 20 | $header = $file->getHeader() |
21 | 21 | } |
22 | - |
|
23 | 22 | * you can instead simply call $header->getHeader() and handle this exception if |
24 | 23 | * said file has no header |
25 | 24 | * |
@@ -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; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | * Read in the specified amount of characters from the input source |
120 | 120 | * |
121 | 121 | * @param integer Amount of characters to read from input source |
122 | - * @return string|boolean The specified amount of characters read from input source |
|
122 | + * @return false|string The specified amount of characters read from input source |
|
123 | 123 | */ |
124 | 124 | public function read($chars) |
125 | 125 | { |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | * |
247 | 247 | * After the stream has been detached, the stream is in an unusable state. |
248 | 248 | * |
249 | - * @return BufferStream|null Underlying PHP stream, if any |
|
249 | + * @return string Underlying PHP stream, if any |
|
250 | 250 | */ |
251 | 251 | public function detach() |
252 | 252 | { |
@@ -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; |