php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-18 23:43:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9839 from jeicd/fix-phpdoc

Browse Source 
Fix phpdoc [skip ci]
This commit is contained in:
Alexander Makarov
2015-10-05 12:18:47 +03:00
parent fcfba66bef c2f83da8d8
commit fcbbb11d54
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/base/Theme.php
View File

@@ -92,7 +92,7 @@ class Theme extends Component
} }
/** /**
* @param $url string the base URL or path alias for this theme. All resources of this theme are considered * @param string $url the base URL or path alias for this theme. All resources of this theme are considered
* to be under this base URL. * to be under this base URL.
*/ */
public function setBaseUrl($url) public function setBaseUrl($url)

4
framework/db/oci/Schema.php
View File

@@ -171,9 +171,9 @@ SQL;
/** /**
* Sequence name of table * Sequence name of table
* *
* @param $tableName * @param string $tableName
* @internal param \yii\db\TableSchema $table->name the table schema * @internal param \yii\db\TableSchema $table->name the table schema
* @return string whether the sequence exists * @return string|null whether the sequence exists
*/ */
protected function getTableSequenceName($tableName) protected function getTableSequenceName($tableName)
{ {

2
framework/i18n/PhpMessageSource.php
View File

@@ -113,7 +113,7 @@ class PhpMessageSource extends MessageSource
/** /**
* Loads the message translation for the specified language and category or returns null if file doesn't exist. * Loads the message translation for the specified language and category or returns null if file doesn't exist.
* *
* @param $messageFile string path to message file * @param string $messageFile path to message file
* @return array|null array of messages or null if file not found * @return array|null array of messages or null if file not found
*/ */
protected function loadMessagesFromFile($messageFile) protected function loadMessagesFromFile($messageFile)

2
framework/rbac/ManagerInterface.php
View File

@@ -195,8 +195,8 @@ interface ManagerInterface
/** /**
* Returns the assignment information regarding a role and a user. * Returns the assignment information regarding a role and a user.
* @param string|integer $userId the user ID (see [[\yii\web\User::id]])
* @param string $roleName the role name * @param string $roleName the role name
* @param string|integer $userId the user ID (see [[\yii\web\User::id]])
* @return null|Assignment the assignment information. Null is returned if * @return null|Assignment the assignment information. Null is returned if
* the role is not assigned to the user. * the role is not assigned to the user.
*/ */

2
framework/web/ErrorHandler.php
View File

@@ -255,8 +255,8 @@ class ErrorHandler extends \yii\base\ErrorHandler
* @param integer|null $line number on which call has happened. * @param integer|null $line number on which call has happened.
* @param string|null $class called class name. * @param string|null $class called class name.
* @param string|null $method called function/method name. * @param string|null $method called function/method name.
* @param integer $index number of the call stack element.
* @param array $args array of method arguments. * @param array $args array of method arguments.
* @param integer $index number of the call stack element.
* @return string HTML content of the rendered call stack element. * @return string HTML content of the rendered call stack element.
*/ */
public function renderCallStackItem($file, $line, $class, $method, $args, $index) public function renderCallStackItem($file, $line, $class, $method, $args, $index)

2
framework/web/Request.php
View File

@@ -350,7 +350,7 @@ class Request extends \yii\base\Request
/** /**
* Sets the raw HTTP request body, this method is mainly used by test scripts to simulate raw HTTP requests. * Sets the raw HTTP request body, this method is mainly used by test scripts to simulate raw HTTP requests.
* @param $rawBody * @param string $rawBody the request body
*/ */
public function setRawBody($rawBody) public function setRawBody($rawBody)
{ {