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

renamed AR trait classes

Browse Source
This commit is contained in:
Carsten Brandt
2013-11-13 16:50:30 +01:00
parent 3130aadb33
commit b8e31d50bb
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/ar/ActiveQuery.php → framework/yii/ar/ActiveQueryTrait.php
View File

@ -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.

2
framework/yii/ar/ActiveRelation.php → framework/yii/ar/ActiveRelationTrait.php
View File

@ -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.

2
framework/yii/db/ActiveQuery.php
View File

@ -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.

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

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

2
framework/yii/db/Query.php
View File

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

2
framework/yii/db/BaseQuery.php → framework/yii/db/QueryTrait.php
View File

@ -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.