From c7ff329e3c5f3a34efa66a5b95b236c35da9918b Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sat, 16 Nov 2013 21:30:34 -0500 Subject: [PATCH] doc fix. --- framework/yii/base/Application.php | 3 ++- framework/yii/db/ActiveRelation.php | 3 --- framework/yii/web/Request.php | 1 - framework/yii/web/Session.php | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/framework/yii/base/Application.php b/framework/yii/base/Application.php index b729158f96..0af586c39f 100644 --- a/framework/yii/base/Application.php +++ b/framework/yii/base/Application.php @@ -31,7 +31,8 @@ use yii\web\HttpException; * @property \yii\web\UrlManager $urlManager The URL manager for this application. This property is read-only. * @property string $vendorPath The directory that stores vendor files. Defaults to "vendor" directory under * [[basePath]]. - * @property View $view The view object that is used to render various view files. This property is read-only. + * @property View|\yii\web\View $view The view object that is used to render various view files. This property + * is read-only. * * @author Qiang Xue * @since 2.0 diff --git a/framework/yii/db/ActiveRelation.php b/framework/yii/db/ActiveRelation.php index ea9b87aed9..b016c5cd05 100644 --- a/framework/yii/db/ActiveRelation.php +++ b/framework/yii/db/ActiveRelation.php @@ -20,9 +20,6 @@ namespace yii\db; * * If a relation involves a pivot table, it may be specified by [[via()]] or [[viaTable()]] method. * - * @property array|ActiveRelation $via the query associated with the pivot table. Please call [[via()]] - * or [[viaTable()]] to set this property instead of directly setting it. - * * @author Qiang Xue * @author Carsten Brandt * @since 2.0 diff --git a/framework/yii/web/Request.php b/framework/yii/web/Request.php index 9e525fd6ce..0b497304de 100644 --- a/framework/yii/web/Request.php +++ b/framework/yii/web/Request.php @@ -35,7 +35,6 @@ use yii\helpers\Security; * @property string $csrfTokenFromHeader The CSRF token sent via [[CSRF_HEADER]] by browser. Null is returned * if no such header is sent. This property is read-only. * @property array $delete The DELETE request parameter values. This property is read-only. - * @property array $get The GET request parameter values. This property is read-only. * @property string $hostInfo Schema and hostname part (with port number if needed) of the request URL (e.g. * `http://www.yiiframework.com`). * @property boolean $isAjax Whether this is an AJAX (XMLHttpRequest) request. This property is read-only. diff --git a/framework/yii/web/Session.php b/framework/yii/web/Session.php index 9fba49a27a..894d75d422 100644 --- a/framework/yii/web/Session.php +++ b/framework/yii/web/Session.php @@ -46,7 +46,7 @@ use yii\base\InvalidParamException; * call methods such as [[setFlash()]], [[getFlash()]]. * * @property array $allFlashes Flash messages (key => message). This property is read-only. - * @property array $cookieParams The session cookie parameters. + * @property array $cookieParams The session cookie parameters. This property is read-only. * @property integer $count The number of session variables. This property is read-only. * @property string $flash The key identifying the flash message. Note that flash messages and normal session * variables share the same name space. If you have a normal session variable using the same name, its value will