yiisoft / yii2

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/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/i18n/MessageFormatter.php

Doc Comments +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
     /**
      * Get the error code from the last operation
      * @link http://php.net/manual/en/messageformatter.geterrorcode.php
-     * @return string Code of the last error.
+     * @return integer Code of the last error.
      */
     public function getErrorCode()
     {
@@ -79,7 +79,7 @@ 
      * @param string $pattern The pattern string to insert parameters into.
      * @param array $params The array of name value pairs to insert into the format string.
      * @param string $language The locale to use for formatting locale-dependent parts
-     * @return string|boolean The formatted pattern string or `FALSE` if an error occurred
+     * @return string|false The formatted pattern string or `FALSE` if an error occurred
      */
     public function format($pattern, $params, $language)
     {
@@ -244,7 +244,7 @@ 
      * @param string $pattern The pattern string to insert things into.
      * @param array $args The array of values to insert into the format string
      * @param string $locale The locale to use for formatting locale-dependent parts
-     * @return string|boolean The formatted pattern string or `FALSE` if an error occurred
+     * @return false|string The formatted pattern string or `FALSE` if an error occurred
      */
     protected function fallbackFormat($pattern, $args, $locale)
     {

framework/log/Logger.php

Doc Comments +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
      * Logs a message with the given type and category.
      * If [[traceLevel]] is greater than 0, additional call stack information about
      * the application code will be logged as well.
-     * @param string|array $message the message to be logged. This can be a simple string or a more
+     * @param string $message the message to be logged. This can be a simple string or a more
      * complex data structure that will be handled by a [[Target|log target]].
      * @param integer $level the level of the message. This must be one of the following:
      * `Logger::LEVEL_ERROR`, `Logger::LEVEL_WARNING`, `Logger::LEVEL_INFO`, `Logger::LEVEL_TRACE`,
@@ -193,7 +193,7 @@ 
      * `$categories` and `$excludeCategories` as parameters to retrieve the
      * results that you are interested in.
      *
-     * @param array $categories list of categories that you are interested in.
+     * @param string[] $categories list of categories that you are interested in.
      * You can use an asterisk at the end of a category to do a prefix match.
      * For example, 'yii\db\*' will match categories starting with 'yii\db\',
      * such as 'yii\db\Connection'.
@@ -242,7 +242,7 @@ 
      * Returns the statistical results of DB queries.
      * The results returned include the number of SQL statements executed and
      * the total time spent.
-     * @return array the first element indicates the number of SQL statements executed,
+     * @return integer[] the first element indicates the number of SQL statements executed,
      * and the second element the total time spent in SQL execution.
      */
     public function getDbProfiling()

framework/log/SyslogTarget.php

Doc Comments +1 added lines

@@ -54,6 +54,7 @@
 
     /**
      * @inheritdoc
+     * @return string
      */
     public function formatMessage($message)
     {

framework/requirements/YiiRequirementChecker.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      * Check the given requirements, collecting results into internal field.
      * This method can be invoked several times checking different requirement sets.
      * Use [[getResult()]] or [[render()]] to get the results.
-     * @param array|string $requirements requirements to be checked.
+     * @param string $requirements requirements to be checked.
      * If an array, it is treated as the set of requirements;
      * If a string, it is treated as the path of the file, which contains the requirements;
      * @return $this self instance.

framework/web/AssetManager.php

Doc Comments +3 added lines, -3 removed lines

@@ -326,7 +326,7 @@ 
      * Returns the actual file path for the specified asset.
      * @param AssetBundle $bundle the asset bundle which the asset file belongs to
      * @param string $asset the asset path. This should be one of the assets listed in [[js]] or [[css]].
-     * @return string|boolean the actual file path, or false if the asset is specified as an absolute URL
+     * @return string|false the actual file path, or false if the asset is specified as an absolute URL
      */
     public function getAssetPath($bundle, $asset)
     {
@@ -462,7 +462,7 @@ 
     /**
      * Publishes a file.
      * @param string $src the asset file to be published
-     * @return array the path and the URL that the asset is published as.
+     * @return string[] the path and the URL that the asset is published as.
      * @throws InvalidParamException if the asset to be published does not exist.
      */
     protected function publishFile($src)
@@ -507,7 +507,7 @@ 
      *   it is found in the target directory. This option is used only when publishing a directory.
      *   This overrides [[forceCopy]] if set.
      *
-     * @return array the path directory and the URL that the asset is published as.
+     * @return string[] the path directory and the URL that the asset is published as.
      * @throws InvalidParamException if the asset to be published does not exist.
      */
     protected function publishDirectory($src, $options)

framework/web/Request.php

Doc Comments +1 added lines, -1 removed lines

@@ -426,7 +426,7 @@
      * If the parameter does not exist, the second parameter passed to this method will be returned.
      * @param string $name the parameter name
      * @param mixed $defaultValue the default parameter value if the parameter does not exist.
-     * @return mixed the parameter value
+     * @return string the parameter value
      * @see getBodyParams()
      * @see setBodyParams()
      */

framework/web/Response.php

Doc Comments +1 added lines, -1 removed lines

@@ -726,7 +726,7 @@
      * });
      * ~~~
      *
-     * @param string|array $url the URL to be redirected to. This can be in one of the following formats:
+     * @param string $url the URL to be redirected to. This can be in one of the following formats:
      *
      * - a string representing a URL (e.g. "http://example.com")
      * - a string representing a URL alias (e.g. "@example.com")