Browse Source

fixed conflicting property declaration

tags/2.0.0-beta
Carsten Brandt 11 years ago
parent
commit
3130aadb33
  1. 12
      framework/yii/db/ActiveRelation.php

12
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 <qiang.xue@gmail.com>
* @since 2.0
*/
@ -30,13 +31,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.
* @param array $link the link between the pivot table and the table associated with [[primaryModel]].

Loading…
Cancel
Save