moved db interfaces and traits back to yii/db.

framework/yii/data/ActiveDataProvider.php

@@ -8,7 +8,7 @@
 namespace yii\data;
 
 use Yii;
-use yii\ar\ActiveQueryInterface;
+use yii\db\ActiveQueryInterface;
 use yii\base\InvalidConfigException;
 use yii\base\Model;
 use yii\db\Connection;

framework/yii/db/ActiveQuery.php

@@ -7,8 +7,6 @@
  */
 
 namespace yii\db;
-use yii\ar\ActiveQueryInterface;
-use yii\ar\ActiveQueryTrait;
 
 /**
  * ActiveQuery represents a DB query associated with an Active Record class.

framework/yii/ar/ActiveQueryInterface.php → framework/yii/db/ActiveQueryInterface.php

@@ -5,8 +5,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\ar;
-use yii\db\QueryInterface;
+namespace yii\db;
 
 /**
  * ActiveQueryInterface defines the common interface to be implemented by active record query classes.

framework/yii/ar/ActiveQueryTrait.php → framework/yii/db/ActiveQueryTrait.php

@@ -5,9 +5,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\ar;
-
-use yii\db\ActiveRecord;
+namespace yii\db;
 
 /**
  * ActiveQueryTrait implements the common methods and properties for active record query classes.

framework/yii/db/ActiveRecord.php

@@ -8,7 +8,6 @@
 
 namespace yii\db;
 
-use yii\ar\ActiveRelationInterface;
 use yii\base\InvalidConfigException;
 use yii\base\Model;
 use yii\base\InvalidParamException;

framework/yii/db/ActiveRelation.php

@@ -7,8 +7,6 @@
  */
 
 namespace yii\db;
-use yii\ar\ActiveRelationInterface;
-use yii\ar\ActiveRelationTrait;
 
 /**
  * ActiveRelation represents a relation between two Active Record classes.

framework/yii/ar/ActiveRelationInterface.php → framework/yii/db/ActiveRelationInterface.php

@@ -5,7 +5,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\ar;
+namespace yii\db;
 
 /**
  * ActiveRelationInterface defines the common interface to be implemented by active record relation classes.

framework/yii/ar/ActiveRelationTrait.php → framework/yii/db/ActiveRelationTrait.php

@@ -5,10 +5,9 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\ar;
+namespace yii\db;
 
 use yii\base\InvalidConfigException;
-use yii\db\ActiveRecord;
 
 /**
  * ActiveRelationTrait implements the common methods and properties for active record relation classes.