Merge branch 'master' of git://github.com/yiisoft/yii2

framework/db/ActiveRelationTrait.php

@@ -44,7 +44,7 @@ trait ActiveRelationTrait
      */
     public $link;
     /**
-     * @var array the query associated with the pivot table. Please call [[via()]]
+     * @var array|object the query associated with the pivot table. Please call [[via()]]
      * to set this property instead of directly setting it.
      * This property is only used in relational context.
      * @see via()