renamed AR trait classes

framework/yii/ar/ActiveQueryTrait.php

@@ -42,7 +42,7 @@ use yii\db\ActiveRecord;
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
-trait ActiveQuery
+trait ActiveQueryTrait
 {
 	/**
 	 * @var string the name of the ActiveRecord class.

framework/yii/ar/ActiveRelationTrait.php

@@ -25,7 +25,7 @@ use yii\db\ActiveRecord;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-trait ActiveRelation
+trait ActiveRelationTrait
 {
 	/**
 	 * @var boolean whether this relation should populate all query results into AR instances.

framework/yii/db/ActiveQuery.php

@@ -46,7 +46,7 @@ namespace yii\db;
  */
 class ActiveQuery extends Query
 {
-	use \yii\ar\ActiveQuery;
+	use \yii\ar\ActiveQueryTrait;
 
 	/**
 	 * @var string the SQL statement to be executed for retrieving AR records.

framework/yii/db/ActiveRelation.php

@@ -28,7 +28,7 @@ namespace yii\db;
  */
 class ActiveRelation extends ActiveQuery
 {
-	use \yii\ar\ActiveRelation;
+	use \yii\ar\ActiveRelationTrait;
 
 	/**
 	 * Specifies the pivot table.

framework/yii/db/Query.php

@@ -37,7 +37,7 @@ use yii\base\Component;
  */
 class Query extends Component
 {
-	use BaseQuery;
+	use QueryTrait;
 
 	/**
 	 * Sort ascending

framework/yii/db/QueryTrait.php

@@ -33,7 +33,7 @@ const SORT_DESC = true;
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
-trait BaseQuery
+trait QueryTrait
 {
 	/**
 	 * @var string|array query condition. This refers to the WHERE clause in a SQL statement.