yiisoft / yii2

framework/db/ActiveRelationTrait.php

Doc Comments +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@ 
      * Finds the related records and populates them into the primary models.
      * @param string $name the relation name
      * @param array $primaryModels primary models
-     * @return array the related models
+     * @return ActiveRecordInterface[] the related models
      * @throws InvalidConfigException if [[link]] is invalid
      */
     public function populateRelation($name, &$primaryModels)
@@ -341,7 +341,7 @@ 
     }
 
     /**
-     * @param array $models
+     * @param ActiveRecordInterface[] $models
      * @param array $link
      * @param array $viaModels
      * @param array $viaLink

framework/db/DataReader.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     /**
      * Returns a single column from the next row of a result set.
      * @param integer $columnIndex zero-based column index
-     * @return mixed the column of the current row, false if no more rows available
+     * @return string the column of the current row, false if no more rows available
      */
     public function readColumn($columnIndex)
     {

framework/db/oci/Schema.php

Doc Comments +1 added lines

@@ -54,6 +54,7 @@
 
     /**
      * @inheritdoc
+     * @param string $name
      */
     public function quoteSimpleTableName($name)
     {

framework/db/Query.php

Doc Comments +6 added lines, -6 removed lines

@@ -288,7 +288,7 @@ 
      * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression.
      * @param Connection $db the database connection used to generate the SQL statement.
      * If this parameter is not given (or null), the `db` application component will be used.
-     * @return integer|string number of records. The result may be a string depending on the
+     * @return boolean|string number of records. The result may be a string depending on the
      * underlying database engine and to support integer values higher than a 32bit PHP integer can handle.
      */
     public function count($q = '*', $db = null)
@@ -302,7 +302,7 @@ 
      * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression.
      * @param Connection $db the database connection used to generate the SQL statement.
      * If this parameter is not given, the `db` application component will be used.
-     * @return mixed the sum of the specified column values.
+     * @return boolean|string the sum of the specified column values.
      */
     public function sum($q, $db = null)
     {
@@ -315,7 +315,7 @@ 
      * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression.
      * @param Connection $db the database connection used to generate the SQL statement.
      * If this parameter is not given, the `db` application component will be used.
-     * @return mixed the average of the specified column values.
+     * @return boolean|string the average of the specified column values.
      */
     public function average($q, $db = null)
     {
@@ -328,7 +328,7 @@ 
      * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression.
      * @param Connection $db the database connection used to generate the SQL statement.
      * If this parameter is not given, the `db` application component will be used.
-     * @return mixed the minimum of the specified column values.
+     * @return boolean|string the minimum of the specified column values.
      */
     public function min($q, $db = null)
     {
@@ -341,7 +341,7 @@ 
      * Make sure you properly [quote](guide:db-dao#quoting-table-and-column-names) column names in the expression.
      * @param Connection $db the database connection used to generate the SQL statement.
      * If this parameter is not given, the `db` application component will be used.
-     * @return mixed the maximum of the specified column values.
+     * @return boolean|string the maximum of the specified column values.
      */
     public function max($q, $db = null)
     {
@@ -775,7 +775,7 @@ 
 
     /**
      * Appends a SQL statement using UNION operator.
-     * @param string|Query $sql the SQL statement to be appended using UNION
+     * @param Query $sql the SQL statement to be appended using UNION
      * @param boolean $all TRUE if using UNION ALL and FALSE if using UNION
      * @return $this the query object itself
      */

framework/grid/ActionColumn.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 namespace yii\grid;
 
 use Yii;
-use Closure;
 use yii\helpers\Html;
 use yii\helpers\Url;
 

framework/helpers/BaseArrayHelper.php

Doc Comments +3 added lines, -3 removed lines

@@ -360,8 +360,8 @@ 
      * ~~~
      *
      * @param array $array
-     * @param string|\Closure $from
-     * @param string|\Closure $to
+     * @param string $from
+     * @param string $to
      * @param string|\Closure $group
      * @return array
      */
@@ -414,7 +414,7 @@ 
      * To sort by multiple keys, provide an array of keys here.
      * @param integer|array $direction the sorting direction. It can be either `SORT_ASC` or `SORT_DESC`.
      * When sorting by multiple keys with different sorting directions, use an array of sorting directions.
-     * @param integer|array $sortFlag the PHP sort flag. Valid values include
+     * @param integer $sortFlag the PHP sort flag. Valid values include
      * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, `SORT_LOCALE_STRING`, `SORT_NATURAL` and `SORT_FLAG_CASE`.
      * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php)
      * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags.

framework/helpers/BaseConsole.php

Doc Comments +7 added lines, -7 removed lines

@@ -575,7 +575,7 @@ 
      * - windows without ansicon
      * - not tty consoles
      *
-     * @param mixed $stream
+     * @param resource $stream
      * @return boolean true if the stream supports ANSI colors, otherwise false.
      */
     public static function streamSupportsAnsiColors($stream)
@@ -600,7 +600,7 @@ 
      * @param boolean $refresh whether to force checking and not re-use cached size value.
      * This is useful to detect changing window size while the application is running but may
      * not get up to date values on every terminal.
-     * @return array|boolean An array of ($width, $height) or false when it was not able to determine size.
+     * @return string An array of ($width, $height) or false when it was not able to determine size.
      */
     public static function getScreenSize($refresh = false)
     {
@@ -691,7 +691,7 @@ 
      * Prints a string to STDOUT.
      *
      * @param string $string the string to print
-     * @return int|boolean Number of bytes printed or false on error
+     * @return integer Number of bytes printed or false on error
      */
     public static function stdout($string)
     {
@@ -702,7 +702,7 @@ 
      * Prints a string to STDERR.
      *
      * @param string $string the string to print
-     * @return int|boolean Number of bytes printed or false on error
+     * @return integer Number of bytes printed or false on error
      */
     public static function stderr($string)
     {
@@ -729,7 +729,7 @@ 
      * Prints text to STDOUT appended with a carriage return (PHP_EOL).
      *
      * @param string $string the text to print
-     * @return integer|boolean number of bytes printed or false on error.
+     * @return integer number of bytes printed or false on error.
      */
     public static function output($string = null)
     {
@@ -740,7 +740,7 @@ 
      * Prints text to STDERR appended with a carriage return (PHP_EOL).
      *
      * @param string $string the text to print
-     * @return integer|boolean number of bytes printed or false on error.
+     * @return integer number of bytes printed or false on error.
      */
     public static function error($string = null)
     {
@@ -806,7 +806,7 @@ 
      *
      * @param string $message to print out before waiting for user input
      * @param boolean $default this value is returned if no selection is made.
-     * @return boolean whether user confirmed
+     * @return boolean|null whether user confirmed
      */
     public static function confirm($message, $default = false)
     {

framework/helpers/BaseFileHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -623,7 +623,7 @@
      * @param string $pattern
      * @param boolean $caseSensitive
      * @throws \yii\base\InvalidParamException
-     * @return array with keys: (string) pattern, (int) flags, (int|boolean) firstWildcard
+     * @return string with keys: (string) pattern, (int) flags, (int|boolean) firstWildcard
      */
     private static function parseExcludePattern($pattern, $caseSensitive)
     {

framework/helpers/BaseHtml.php

Doc Comments +2 added lines, -2 removed lines

@@ -199,7 +199,7 @@ 
 
     /**
      * Generates a link tag that refers to an external CSS file.
-     * @param array|string $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]].
+     * @param string|boolean $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]].
      * @param array $options the tag options in terms of name-value pairs. The following option is specially handled:
      *
      * - condition: specifies the conditional comments for IE, e.g., `lt IE 9`. When this is specified,
@@ -1810,7 +1810,7 @@ 
      * ~~~
      *
      * @param array $options the options to be modified.
-     * @param string|array $class the CSS class(es) to be added
+     * @param string $class the CSS class(es) to be added
      */
     public static function addCssClass(&$options, $class)
     {