@@ -158,6 +158,9 @@ |
||
158 | 158 | return $this; |
159 | 159 | } |
160 | 160 | |
161 | + /** |
|
162 | + * @param string $name |
|
163 | + */ |
|
161 | 164 | protected function getOption($name, $default = null) { |
162 | 165 | return isset($this->options[$name]) ? $this->options[$name] : $default; |
163 | 166 | } |
@@ -8,7 +8,6 @@ |
||
8 | 8 | namespace Garden\Db; |
9 | 9 | |
10 | 10 | use PDO; |
11 | -use Traversable; |
|
12 | 11 | |
13 | 12 | /** |
14 | 13 | * Represents a dataset on a delayed query. |
@@ -599,7 +599,7 @@ |
||
599 | 599 | /** |
600 | 600 | * Build a sql update statement. |
601 | 601 | * |
602 | - * @param string|Identifier $table The name of the table to update. |
|
602 | + * @param string $table The name of the table to update. |
|
603 | 603 | * @param array $set An array of columns to set. |
604 | 604 | * @param array $where The where filter. |
605 | 605 | * @param array $options Additional options for the query. |
@@ -71,6 +71,7 @@ |
||
71 | 71 | * Set the sort order. |
72 | 72 | * |
73 | 73 | * @param string ...$columns The column names to sort by, optionally prefixed with "-" to denote descending order. |
74 | + * @param string[] $columns |
|
74 | 75 | * @return $this |
75 | 76 | */ |
76 | 77 | public function setOrder(...$columns); |
@@ -20,6 +20,7 @@ |
||
20 | 20 | /** |
21 | 21 | * Identifier constructor. |
22 | 22 | * @param string ...$identifier |
23 | + * @param string[] $identifier |
|
23 | 24 | */ |
24 | 25 | public function __construct(...$identifier) { |
25 | 26 | if (empty($identifier) || empty($identifier[0])) { |
@@ -87,6 +87,7 @@ discard block |
||
87 | 87 | * Set the primaryKey. |
88 | 88 | * |
89 | 89 | * @param string ...$primaryKey The names of the columns in the primary key. |
90 | + * @param string[] $primaryKey |
|
90 | 91 | * @return $this |
91 | 92 | */ |
92 | 93 | protected function setPrimaryKey(...$primaryKey) { |
@@ -362,6 +363,7 @@ discard block |
||
362 | 363 | * The default sort order will be passed to all queries, but can be overridden in the {@link DatasetInterface}. |
363 | 364 | * |
364 | 365 | * @param string ...$columns The column names to sort by, optionally prefixed with "-" to denote descending order. |
366 | + * @param string[] $columns |
|
365 | 367 | * @return $this |
366 | 368 | */ |
367 | 369 | public function setDefaultOrder(...$columns) { |
@@ -139,6 +139,7 @@ |
||
139 | 139 | * |
140 | 140 | * @param string $type One of the `Db::INDEX_*` constants. |
141 | 141 | * @param string ...$columns The columns in the index. |
142 | + * @param string[] $columns |
|
142 | 143 | * @return $this |
143 | 144 | */ |
144 | 145 | public function addIndex($type, ...$columns) { |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | /** |
54 | 54 | * Retrieve an external iterator |
55 | 55 | * @link http://php.net/manual/en/iteratoraggregate.getiterator.php |
56 | - * @return Traversable Returns a generator of all rows. |
|
56 | + * @return \ArrayIterator Returns a generator of all rows. |
|
57 | 57 | */ |
58 | 58 | public function getIterator() { |
59 | 59 | return new \ArrayIterator($this->getData()); |
@@ -246,6 +246,7 @@ discard block |
||
246 | 246 | * Set the sort order. |
247 | 247 | * |
248 | 248 | * @param string ...$columns The column names to sort by, optionally prefixed with "-" to denote descending order. |
249 | + * @param string[] $columns |
|
249 | 250 | * @return $this |
250 | 251 | */ |
251 | 252 | public function setOrder(...$columns) { |
@@ -317,6 +317,7 @@ discard block |
||
317 | 317 | * Set the sort order. |
318 | 318 | * |
319 | 319 | * @param string ...$columns The column names to sort by, optionally prefixed with "-" to denote descending order. |
320 | + * @param string[] $columns |
|
320 | 321 | * @return $this |
321 | 322 | */ |
322 | 323 | public function setOrder(...$columns) { |
@@ -328,6 +329,7 @@ discard block |
||
328 | 329 | * Add one or more columns to the the order array. |
329 | 330 | * |
330 | 331 | * @param string ...$columns Column names optionally starting with a "-". |
332 | + * @param string[] $columns |
|
331 | 333 | * @return $this |
332 | 334 | */ |
333 | 335 | public function addOrder(...$columns) { |