@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @param array $a array to be merged to |
113 | 113 | * @param array $b array to be merged from. You can specify additional |
114 | 114 | * arrays via third argument, fourth argument etc. |
115 | - * @return array the merged array (the original arrays are not changed.) |
|
115 | + * @return callable the merged array (the original arrays are not changed.) |
|
116 | 116 | */ |
117 | 117 | public static function merge($a, $b) |
118 | 118 | { |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | * ``` |
448 | 448 | * |
449 | 449 | * @param array $array the array that needs to be indexed or grouped |
450 | - * @param string|\Closure|null $key the column name or anonymous function which result will be used to index the array |
|
450 | + * @param null|string $key the column name or anonymous function which result will be used to index the array |
|
451 | 451 | * @param string|string[]|\Closure[]|null $groups the array of keys, that will be used to group the input array |
452 | 452 | * by one or more keys. If the $key attribute or its value for the particular element is null and $groups is not |
453 | 453 | * defined, the array element will be discarded. Otherwise, if $groups is specified, array element will be added |
@@ -567,8 +567,8 @@ discard block |
||
567 | 567 | * ``` |
568 | 568 | * |
569 | 569 | * @param array $array |
570 | - * @param string|\Closure $from |
|
571 | - * @param string|\Closure $to |
|
570 | + * @param string $from |
|
571 | + * @param string $to |
|
572 | 572 | * @param string|\Closure $group |
573 | 573 | * @return array |
574 | 574 | */ |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | * To sort by multiple keys, provide an array of keys here. |
624 | 624 | * @param int|array $direction the sorting direction. It can be either `SORT_ASC` or `SORT_DESC`. |
625 | 625 | * When sorting by multiple keys with different sorting directions, use an array of sorting directions. |
626 | - * @param int|array $sortFlag the PHP sort flag. Valid values include |
|
626 | + * @param integer $sortFlag the PHP sort flag. Valid values include |
|
627 | 627 | * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, `SORT_LOCALE_STRING`, `SORT_NATURAL` and `SORT_FLAG_CASE`. |
628 | 628 | * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php) |
629 | 629 | * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags. |
@@ -355,7 +355,7 @@ |
||
355 | 355 | * Safely casts a float to string independent of the current locale. |
356 | 356 | * |
357 | 357 | * The decimal separator will always be `.`. |
358 | - * @param float|int $number a floating point number or integer. |
|
358 | + * @param double $number a floating point number or integer. |
|
359 | 359 | * @return string the string representation of the number. |
360 | 360 | * @since 2.0.13 |
361 | 361 | */ |
@@ -8,7 +8,6 @@ |
||
8 | 8 | namespace yii\db\mssql; |
9 | 9 | |
10 | 10 | use yii\base\InvalidParamException; |
11 | -use yii\base\NotSupportedException; |
|
12 | 11 | use yii\db\Expression; |
13 | 12 | |
14 | 13 | /** |
@@ -8,7 +8,6 @@ |
||
8 | 8 | namespace yii\db\pgsql; |
9 | 9 | |
10 | 10 | use yii\base\InvalidParamException; |
11 | -use yii\db\ExpressionInterface; |
|
12 | 11 | use yii\db\PdoValue; |
13 | 12 | use yii\db\Query; |
14 | 13 | use yii\helpers\StringHelper; |
@@ -100,7 +100,7 @@ |
||
100 | 100 | |
101 | 101 | /** |
102 | 102 | * {@inheritdoc} |
103 | - * @return static|null ActiveRecord instance matching the condition, or `null` if nothing matches. |
|
103 | + * @return BaseActiveRecord ActiveRecord instance matching the condition, or `null` if nothing matches. |
|
104 | 104 | */ |
105 | 105 | public static function findOne($condition) |
106 | 106 | { |
@@ -240,6 +240,7 @@ |
||
240 | 240 | |
241 | 241 | /** |
242 | 242 | * {@inheritdoc} |
243 | + * @param string $name |
|
243 | 244 | */ |
244 | 245 | public function quoteSimpleTableName($name) |
245 | 246 | { |
@@ -466,6 +466,7 @@ |
||
466 | 466 | |
467 | 467 | /** |
468 | 468 | * {@inheritdoc} |
469 | + * @param Query $query |
|
469 | 470 | */ |
470 | 471 | public function build($query, $params = []) |
471 | 472 | { |
@@ -73,6 +73,7 @@ |
||
73 | 73 | |
74 | 74 | /** |
75 | 75 | * {@inheritdoc} |
76 | + * @return string |
|
76 | 77 | */ |
77 | 78 | public function formatMessage($message) |
78 | 79 | { |
@@ -502,6 +502,10 @@ discard block |
||
502 | 502 | // TODO |
503 | 503 | } |
504 | 504 | |
505 | + /** |
|
506 | + * @param null|string $className |
|
507 | + * @param string $propertyDoc |
|
508 | + */ |
|
505 | 509 | protected function updateClassPropertyDocs($file, $className, $propertyDoc) |
506 | 510 | { |
507 | 511 | try { |
@@ -582,7 +586,7 @@ discard block |
||
582 | 586 | /** |
583 | 587 | * remove multi empty lines and trim trailing whitespace. |
584 | 588 | * |
585 | - * @param $doc |
|
589 | + * @param string $doc |
|
586 | 590 | * @return string |
587 | 591 | */ |
588 | 592 | protected function cleanDocComment($doc) |
@@ -601,7 +605,7 @@ discard block |
||
601 | 605 | |
602 | 606 | /** |
603 | 607 | * Replace property annotations in doc comment. |
604 | - * @param $doc |
|
608 | + * @param string $doc |
|
605 | 609 | * @param $properties |
606 | 610 | * @return string |
607 | 611 | */ |
@@ -768,6 +772,9 @@ discard block |
||
768 | 772 | return [$className, $phpdoc]; |
769 | 773 | } |
770 | 774 | |
775 | + /** |
|
776 | + * @param string $pattern |
|
777 | + */ |
|
771 | 778 | protected function match($pattern, $subject, $split = false) |
772 | 779 | { |
773 | 780 | $sets = []; |
@@ -792,6 +799,9 @@ discard block |
||
792 | 799 | return $sets; |
793 | 800 | } |
794 | 801 | |
802 | + /** |
|
803 | + * @param string $str |
|
804 | + */ |
|
795 | 805 | protected function fixSentence($str) |
796 | 806 | { |
797 | 807 | // TODO fix word wrap |
@@ -802,6 +812,9 @@ discard block |
||
802 | 812 | return strtoupper(substr($str, 0, 1)) . substr($str, 1) . ($str[strlen($str) - 1] != '.' ? '.' : ''); |
803 | 813 | } |
804 | 814 | |
815 | + /** |
|
816 | + * @param string $param |
|
817 | + */ |
|
805 | 818 | protected function getPropParam($prop, $param) |
806 | 819 | { |
807 | 820 | return isset($prop['property']) ? $prop['property'][$param] : (isset($prop['get']) ? $prop['get'][$param] : $prop['set'][$param]); |