From c2f83da8d8561213771dfdd22a8aa01f86e473bb Mon Sep 17 00:00:00 2001 From: jeicd Date: Mon, 5 Oct 2015 15:00:13 +0600 Subject: [PATCH] Fix phpdoc --- framework/base/Theme.php | 2 +- framework/db/oci/Schema.php | 4 ++-- framework/i18n/PhpMessageSource.php | 2 +- framework/rbac/ManagerInterface.php | 2 +- framework/web/ErrorHandler.php | 2 +- framework/web/Request.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/framework/base/Theme.php b/framework/base/Theme.php index bc73915c6e..6d16543b4a 100644 --- a/framework/base/Theme.php +++ b/framework/base/Theme.php @@ -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. */ public function setBaseUrl($url) diff --git a/framework/db/oci/Schema.php b/framework/db/oci/Schema.php index e35f4edb5f..465e423d9c 100644 --- a/framework/db/oci/Schema.php +++ b/framework/db/oci/Schema.php @@ -171,9 +171,9 @@ SQL; /** * Sequence name of table * - * @param $tableName + * @param string $tableName * @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) { diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php index 05f7d77a3d..fc799eea3c 100644 --- a/framework/i18n/PhpMessageSource.php +++ b/framework/i18n/PhpMessageSource.php @@ -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. * - * @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 */ protected function loadMessagesFromFile($messageFile) diff --git a/framework/rbac/ManagerInterface.php b/framework/rbac/ManagerInterface.php index da98c63504..072bbd898e 100644 --- a/framework/rbac/ManagerInterface.php +++ b/framework/rbac/ManagerInterface.php @@ -195,8 +195,8 @@ interface ManagerInterface /** * 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|integer $userId the user ID (see [[\yii\web\User::id]]) * @return null|Assignment the assignment information. Null is returned if * the role is not assigned to the user. */ diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php index a6a37492d0..d3f6fd7cb2 100644 --- a/framework/web/ErrorHandler.php +++ b/framework/web/ErrorHandler.php @@ -255,8 +255,8 @@ class ErrorHandler extends \yii\base\ErrorHandler * @param integer|null $line number on which call has happened. * @param string|null $class called class 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 integer $index number of the call stack element. * @return string HTML content of the rendered call stack element. */ public function renderCallStackItem($file, $line, $class, $method, $args, $index) diff --git a/framework/web/Request.php b/framework/web/Request.php index 73985737f8..ed92759d5f 100644 --- a/framework/web/Request.php +++ b/framework/web/Request.php @@ -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. - * @param $rawBody + * @param string $rawBody the request body */ public function setRawBody($rawBody) {