From 3130aadb33652cae6326cd653f05b5a74da169dd Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Tue, 29 Oct 2013 12:52:52 +0100 Subject: [PATCH] fixed conflicting property declaration --- framework/yii/db/ActiveRelation.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/framework/yii/db/ActiveRelation.php b/framework/yii/db/ActiveRelation.php index 3714c6a5d5..8ca1baf756 100644 --- a/framework/yii/db/ActiveRelation.php +++ b/framework/yii/db/ActiveRelation.php @@ -8,8 +8,6 @@ namespace yii\db; -use yii\base\InvalidConfigException; - /** * ActiveRelation represents a relation between two Active Record classes. * @@ -22,6 +20,9 @@ use yii\base\InvalidConfigException; * * 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 * @since 2.0 */ @@ -29,13 +30,6 @@ class ActiveRelation extends ActiveQuery { use \yii\ar\ActiveRelation; - /** - * @var array|ActiveRelation the query associated with the pivot table. Please call [[via()]] - * or [[viaTable()]] to set this property instead of directly setting it. - */ - public $via; - - /** * Specifies the pivot table. * @param string $tableName the name of the pivot table.