@@ -54,6 +54,7 @@ |
||
54 | 54 | |
55 | 55 | /** |
56 | 56 | * @inheritdoc |
57 | + * @param string $name |
|
57 | 58 | */ |
58 | 59 | public function quoteSimpleTableName($name) |
59 | 60 | { |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression. |
289 | 289 | * @param Connection $db the database connection used to generate the SQL statement. |
290 | 290 | * If this parameter is not given (or null), the `db` application component will be used. |
291 | - * @return integer|string number of records. The result may be a string depending on the |
|
291 | + * @return boolean|string number of records. The result may be a string depending on the |
|
292 | 292 | * underlying database engine and to support integer values higher than a 32bit PHP integer can handle. |
293 | 293 | */ |
294 | 294 | public function count($q = '*', $db = null) |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression. |
303 | 303 | * @param Connection $db the database connection used to generate the SQL statement. |
304 | 304 | * If this parameter is not given, the `db` application component will be used. |
305 | - * @return mixed the sum of the specified column values. |
|
305 | + * @return boolean|string the sum of the specified column values. |
|
306 | 306 | */ |
307 | 307 | public function sum($q, $db = null) |
308 | 308 | { |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression. |
316 | 316 | * @param Connection $db the database connection used to generate the SQL statement. |
317 | 317 | * If this parameter is not given, the `db` application component will be used. |
318 | - * @return mixed the average of the specified column values. |
|
318 | + * @return boolean|string the average of the specified column values. |
|
319 | 319 | */ |
320 | 320 | public function average($q, $db = null) |
321 | 321 | { |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression. |
329 | 329 | * @param Connection $db the database connection used to generate the SQL statement. |
330 | 330 | * If this parameter is not given, the `db` application component will be used. |
331 | - * @return mixed the minimum of the specified column values. |
|
331 | + * @return boolean|string the minimum of the specified column values. |
|
332 | 332 | */ |
333 | 333 | public function min($q, $db = null) |
334 | 334 | { |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression. |
342 | 342 | * @param Connection $db the database connection used to generate the SQL statement. |
343 | 343 | * If this parameter is not given, the `db` application component will be used. |
344 | - * @return mixed the maximum of the specified column values. |
|
344 | + * @return boolean|string the maximum of the specified column values. |
|
345 | 345 | */ |
346 | 346 | public function max($q, $db = null) |
347 | 347 | { |
@@ -775,7 +775,7 @@ discard block |
||
775 | 775 | |
776 | 776 | /** |
777 | 777 | * Appends a SQL statement using UNION operator. |
778 | - * @param string|Query $sql the SQL statement to be appended using UNION |
|
778 | + * @param Query $sql the SQL statement to be appended using UNION |
|
779 | 779 | * @param boolean $all TRUE if using UNION ALL and FALSE if using UNION |
780 | 780 | * @return $this the query object itself |
781 | 781 | */ |
@@ -8,7 +8,6 @@ |
||
8 | 8 | namespace yii\grid; |
9 | 9 | |
10 | 10 | use Yii; |
11 | -use Closure; |
|
12 | 11 | use yii\helpers\Html; |
13 | 12 | use yii\helpers\Url; |
14 | 13 |
@@ -360,8 +360,8 @@ discard block |
||
360 | 360 | * ~~~ |
361 | 361 | * |
362 | 362 | * @param array $array |
363 | - * @param string|\Closure $from |
|
364 | - * @param string|\Closure $to |
|
363 | + * @param string $from |
|
364 | + * @param string $to |
|
365 | 365 | * @param string|\Closure $group |
366 | 366 | * @return array |
367 | 367 | */ |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | * To sort by multiple keys, provide an array of keys here. |
415 | 415 | * @param integer|array $direction the sorting direction. It can be either `SORT_ASC` or `SORT_DESC`. |
416 | 416 | * When sorting by multiple keys with different sorting directions, use an array of sorting directions. |
417 | - * @param integer|array $sortFlag the PHP sort flag. Valid values include |
|
417 | + * @param integer $sortFlag the PHP sort flag. Valid values include |
|
418 | 418 | * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, `SORT_LOCALE_STRING`, `SORT_NATURAL` and `SORT_FLAG_CASE`. |
419 | 419 | * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php) |
420 | 420 | * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags. |
@@ -623,7 +623,7 @@ |
||
623 | 623 | * @param string $pattern |
624 | 624 | * @param boolean $caseSensitive |
625 | 625 | * @throws \yii\base\InvalidParamException |
626 | - * @return array with keys: (string) pattern, (int) flags, (int|boolean) firstWildcard |
|
626 | + * @return string with keys: (string) pattern, (int) flags, (int|boolean) firstWildcard |
|
627 | 627 | */ |
628 | 628 | private static function parseExcludePattern($pattern, $caseSensitive) |
629 | 629 | { |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | |
200 | 200 | /** |
201 | 201 | * Generates a link tag that refers to an external CSS file. |
202 | - * @param array|string $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]]. |
|
202 | + * @param string|boolean $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]]. |
|
203 | 203 | * @param array $options the tag options in terms of name-value pairs. The following option is specially handled: |
204 | 204 | * |
205 | 205 | * - condition: specifies the conditional comments for IE, e.g., `lt IE 9`. When this is specified, |
@@ -1810,7 +1810,7 @@ discard block |
||
1810 | 1810 | * ~~~ |
1811 | 1811 | * |
1812 | 1812 | * @param array $options the options to be modified. |
1813 | - * @param string|array $class the CSS class(es) to be added |
|
1813 | + * @param string $class the CSS class(es) to be added |
|
1814 | 1814 | */ |
1815 | 1815 | public static function addCssClass(&$options, $class) |
1816 | 1816 | { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | /** |
53 | 53 | * Get the error code from the last operation |
54 | 54 | * @link http://php.net/manual/en/messageformatter.geterrorcode.php |
55 | - * @return string Code of the last error. |
|
55 | + * @return integer Code of the last error. |
|
56 | 56 | */ |
57 | 57 | public function getErrorCode() |
58 | 58 | { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param string $pattern The pattern string to insert parameters into. |
80 | 80 | * @param array $params The array of name value pairs to insert into the format string. |
81 | 81 | * @param string $language The locale to use for formatting locale-dependent parts |
82 | - * @return string|boolean The formatted pattern string or `FALSE` if an error occurred |
|
82 | + * @return string|false The formatted pattern string or `FALSE` if an error occurred |
|
83 | 83 | */ |
84 | 84 | public function format($pattern, $params, $language) |
85 | 85 | { |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | * @param string $pattern The pattern string to insert things into. |
245 | 245 | * @param array $args The array of values to insert into the format string |
246 | 246 | * @param string $locale The locale to use for formatting locale-dependent parts |
247 | - * @return string|boolean The formatted pattern string or `FALSE` if an error occurred |
|
247 | + * @return false|string The formatted pattern string or `FALSE` if an error occurred |
|
248 | 248 | */ |
249 | 249 | protected function fallbackFormat($pattern, $args, $locale) |
250 | 250 | { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | * Logs a message with the given type and category. |
129 | 129 | * If [[traceLevel]] is greater than 0, additional call stack information about |
130 | 130 | * the application code will be logged as well. |
131 | - * @param string|array $message the message to be logged. This can be a simple string or a more |
|
131 | + * @param string $message the message to be logged. This can be a simple string or a more |
|
132 | 132 | * complex data structure that will be handled by a [[Target|log target]]. |
133 | 133 | * @param integer $level the level of the message. This must be one of the following: |
134 | 134 | * `Logger::LEVEL_ERROR`, `Logger::LEVEL_WARNING`, `Logger::LEVEL_INFO`, `Logger::LEVEL_TRACE`, |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | * `$categories` and `$excludeCategories` as parameters to retrieve the |
194 | 194 | * results that you are interested in. |
195 | 195 | * |
196 | - * @param array $categories list of categories that you are interested in. |
|
196 | + * @param string[] $categories list of categories that you are interested in. |
|
197 | 197 | * You can use an asterisk at the end of a category to do a prefix match. |
198 | 198 | * For example, 'yii\db\*' will match categories starting with 'yii\db\', |
199 | 199 | * such as 'yii\db\Connection'. |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | * Returns the statistical results of DB queries. |
243 | 243 | * The results returned include the number of SQL statements executed and |
244 | 244 | * the total time spent. |
245 | - * @return array the first element indicates the number of SQL statements executed, |
|
245 | + * @return integer[] the first element indicates the number of SQL statements executed, |
|
246 | 246 | * and the second element the total time spent in SQL execution. |
247 | 247 | */ |
248 | 248 | public function getDbProfiling() |
@@ -54,6 +54,7 @@ |
||
54 | 54 | |
55 | 55 | /** |
56 | 56 | * @inheritdoc |
57 | + * @return string |
|
57 | 58 | */ |
58 | 59 | public function formatMessage($message) |
59 | 60 | { |