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

fixed conflicting property declaration

Browse Source
This commit is contained in:
Carsten Brandt
2013-10-29 12:52:52 +01:00
parent 0146596647
commit 3130aadb33
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/yii/db/ActiveRelation.php
View File

@ -8,8 +8,6 @@
namespace yii\db; namespace yii\db;
use yii\base\InvalidConfigException;
/** /**
* ActiveRelation represents a relation between two Active Record classes. * 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. * 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 <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */
@ -29,13 +30,6 @@ class ActiveRelation extends ActiveQuery
{ {
use \yii\ar\ActiveRelation; 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. * Specifies the pivot table.
* @param string $tableName the name of the pivot table. * @param string $tableName the name of the pivot table.