@@ -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 | /** |
@@ -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 | { |
@@ -614,7 +614,7 @@ discard block |
||
614 | 614 | * |
615 | 615 | * @param int|mixed The offset to set |
616 | 616 | * @param any The value to set it to |
617 | - * @return boolean |
|
617 | + * @return Collection |
|
618 | 618 | */ |
619 | 619 | public function offsetSet($offset, $value) |
620 | 620 | { |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | * Filter out unwanted items using a callback function. |
771 | 771 | * |
772 | 772 | * @param Callable $callback |
773 | - * @return CSVelte\Collection A new collection with filtered items removed |
|
773 | + * @return Collection A new collection with filtered items removed |
|
774 | 774 | */ |
775 | 775 | public function filter(Callable $callback) |
776 | 776 | { |
@@ -822,7 +822,7 @@ discard block |
||
822 | 822 | * Returns an array where the key is a value in the collection and the value |
823 | 823 | * is the number of times that value appears in the collection. |
824 | 824 | * |
825 | - * @return CSVelte\Collection A collection of value frequencies (see description) |
|
825 | + * @return Collection A collection of value frequencies (see description) |
|
826 | 826 | */ |
827 | 827 | public function frequency() |
828 | 828 | { |
@@ -846,7 +846,7 @@ discard block |
||
846 | 846 | * Returns a collection with duplicate values removed. If two-dimensional, |
847 | 847 | * then each array within the collection will have its duplicates removed. |
848 | 848 | * |
849 | - * @return CSVelte\Collection A new collection with duplicate values removed. |
|
849 | + * @return Collection A new collection with duplicate values removed. |
|
850 | 850 | */ |
851 | 851 | public function unique() |
852 | 852 | { |
@@ -862,7 +862,7 @@ discard block |
||
862 | 862 | * Returns a collection of arrays where the key is the duplicate value |
863 | 863 | * and the value is an array of keys from the original collection. |
864 | 864 | * |
865 | - * @return CSVelte\Collection A new collection with duplicate values. |
|
865 | + * @return Collection A new collection with duplicate values. |
|
866 | 866 | */ |
867 | 867 | public function duplicates() |
868 | 868 | { |
@@ -880,7 +880,7 @@ discard block |
||
880 | 880 | * |
881 | 881 | * Get a new collection where the keys and values have been swapped. |
882 | 882 | * |
883 | - * @return CSVelte\Collection A new collection where keys/values have been swapped |
|
883 | + * @return Collection A new collection where keys/values have been swapped |
|
884 | 884 | */ |
885 | 885 | public function flip() |
886 | 886 | { |
@@ -894,7 +894,7 @@ discard block |
||
894 | 894 | * first is the default. |
895 | 895 | * |
896 | 896 | * @param boolean Whether you want pairs in [k => v] rather than [k, v] format |
897 | - * @return CSVelte\Collection A collection of key/value pairs |
|
897 | + * @return Collection A collection of key/value pairs |
|
898 | 898 | */ |
899 | 899 | public function pairs($alt = false) |
900 | 900 | { |
@@ -1056,9 +1056,8 @@ discard block |
||
1056 | 1056 | * default it uses a case-insensitive natural order algorithm, but you can |
1057 | 1057 | * pass it any sorting algorithm you like. |
1058 | 1058 | * |
1059 | - * @param Callable $sort_func The sorting function you want to use |
|
1060 | 1059 | * @param boolean $preserve_keys Whether you want to preserve keys |
1061 | - * @return CSVelte\Collection A new collection sorted by $callback |
|
1060 | + * @return Collection A new collection sorted by $callback |
|
1062 | 1061 | */ |
1063 | 1062 | public function sort(Callable $callback = null, $preserve_keys = true) |
1064 | 1063 | { |
@@ -1088,7 +1087,7 @@ discard block |
||
1088 | 1087 | * @param string $key The key you want to order by |
1089 | 1088 | * @param Callable $cmp The sorting comparison algorithm to use |
1090 | 1089 | * @param boolean $preserve_keys Whether keys should be preserved |
1091 | - * @return CSVelte\Collection A new collection sorted by $cmp and $key |
|
1090 | + * @return Collection A new collection sorted by $cmp and $key |
|
1092 | 1091 | */ |
1093 | 1092 | public function orderBy($key, Callable $cmp = null, $preserve_keys = true) |
1094 | 1093 | { |
@@ -1112,13 +1111,16 @@ discard block |
||
1112 | 1111 | * trying to write a particular sorting algurithm that sorts forwards and back. |
1113 | 1112 | * |
1114 | 1113 | * @param boolean $preserve_keys Whether keys should be preserved |
1115 | - * @return CSVelte\Collection A new collection in reverse order |
|
1114 | + * @return Collection A new collection in reverse order |
|
1116 | 1115 | */ |
1117 | 1116 | public function reverse($preserve_keys = true) |
1118 | 1117 | { |
1119 | 1118 | return new self(array_reverse($this->data, $preserve_keys)); |
1120 | 1119 | } |
1121 | 1120 | |
1121 | + /** |
|
1122 | + * @param string $method |
|
1123 | + */ |
|
1122 | 1124 | protected function if2DMapInternalMethod($method) |
1123 | 1125 | { |
1124 | 1126 | if ($this->is2D()) { |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | /** |
177 | 177 | * Return the current position within the stream/readable |
178 | 178 | * |
179 | - * @return int The current position within readable |
|
179 | + * @return boolean The current position within readable |
|
180 | 180 | */ |
181 | 181 | public function tell() |
182 | 182 | { |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | /** |
229 | 229 | * Closes the stream and any underlying resources. |
230 | 230 | * |
231 | - * @return void |
|
231 | + * @return boolean |
|
232 | 232 | */ |
233 | 233 | public function close() |
234 | 234 | { |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | * Write data to the output. |
279 | 279 | * |
280 | 280 | * @param string The data to write |
281 | - * @return int The number of bytes written |
|
281 | + * @return boolean The number of bytes written |
|
282 | 282 | */ |
283 | 283 | public function write($data) |
284 | 284 | { |
@@ -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 | */ |
@@ -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 void |
|
161 | + * @return string|null |
|
162 | 162 | * @access public |
163 | 163 | */ |
164 | 164 | public function rewind() |
@@ -15,7 +15,6 @@ |
||
15 | 15 | use \Iterator; |
16 | 16 | use \Countable; |
17 | 17 | use \ArrayAccess; |
18 | -use CSVelte\Flavor; |
|
19 | 18 | |
20 | 19 | use \OutOfBoundsException; |
21 | 20 | use \InvalidArgumentException; |
@@ -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) |
@@ -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(); |
@@ -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 string|false The specified amount of characters read from input source |
|
123 | 123 | */ |
124 | 124 | public function read($chars) |
125 | 125 | { |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | /** |
172 | 172 | * Return the current position within the stream/readable |
173 | 173 | * |
174 | - * @return int The current position within readable |
|
174 | + * @return boolean The current position within readable |
|
175 | 175 | */ |
176 | 176 | public function tell() |
177 | 177 | { |