mirror of
https://github.com/yiisoft/yii2.git
synced 2026-03-06 15:28:58 +01:00
Use ::class instead of ::className() in tests. (#20612)
This commit is contained in:
@@ -37,8 +37,8 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
'on' => ['a' => 'b'],
|
||||
'joinWith' => ['dummy relation'],
|
||||
];
|
||||
$query = new ActiveQuery(Customer::className(), $config);
|
||||
$this->assertEquals($query->modelClass, Customer::className());
|
||||
$query = new ActiveQuery(Customer::class, $config);
|
||||
$this->assertEquals($query->modelClass, Customer::class);
|
||||
$this->assertEquals($query->on, $config['on']);
|
||||
$this->assertEquals($query->joinWith, $config['joinWith']);
|
||||
}
|
||||
@@ -49,10 +49,10 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
$callback = function (Event $event) use ($where) {
|
||||
$event->sender->where = $where;
|
||||
};
|
||||
Event::on(ActiveQuery::className(), ActiveQuery::EVENT_INIT, $callback);
|
||||
$result = new ActiveQuery(Customer::className());
|
||||
Event::on(ActiveQuery::class, ActiveQuery::EVENT_INIT, $callback);
|
||||
$result = new ActiveQuery(Customer::class);
|
||||
$this->assertEquals($where, $result->where);
|
||||
Event::off(ActiveQuery::className(), ActiveQuery::EVENT_INIT, $callback);
|
||||
Event::off(ActiveQuery::class, ActiveQuery::EVENT_INIT, $callback);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -60,7 +60,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
*/
|
||||
public function testPrepare(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$builder = new QueryBuilder(new Connection());
|
||||
$result = $query->prepare($builder);
|
||||
$this->assertInstanceOf('yii\db\Query', $result);
|
||||
@@ -68,7 +68,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
|
||||
public function testPopulate_EmptyRows(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$rows = [];
|
||||
$result = $query->populate([]);
|
||||
$this->assertEquals($rows, $result);
|
||||
@@ -79,7 +79,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
*/
|
||||
public function testPopulate_FilledRows(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$rows = $query->all();
|
||||
$result = $query->populate($rows);
|
||||
$this->assertEquals($rows, $result);
|
||||
@@ -90,7 +90,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
*/
|
||||
public function testOne(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$result = $query->one();
|
||||
$this->assertInstanceOf('yiiunit\data\ar\Customer', $result);
|
||||
}
|
||||
@@ -100,7 +100,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
*/
|
||||
public function testCreateCommand(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$result = $query->createCommand();
|
||||
$this->assertInstanceOf('yii\db\Command', $result);
|
||||
}
|
||||
@@ -110,7 +110,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
*/
|
||||
public function testQueryScalar(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$result = $this->invokeMethod($query, 'queryScalar', ['name', null]);
|
||||
$this->assertEquals('user1', $result);
|
||||
}
|
||||
@@ -120,7 +120,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
*/
|
||||
public function testJoinWith(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$result = $query->joinWith('profile');
|
||||
$this->assertEquals([
|
||||
[['profile'], true, 'LEFT JOIN'],
|
||||
@@ -132,7 +132,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
*/
|
||||
public function testInnerJoinWith(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$result = $query->innerJoinWith('profile');
|
||||
$this->assertEquals([
|
||||
[['profile'], true, 'INNER JOIN'],
|
||||
@@ -141,7 +141,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
|
||||
public function testBuildJoinWithRemoveDuplicateJoinByTableName(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$query->innerJoinWith('orders')
|
||||
->joinWith('orders.orderItems');
|
||||
$this->invokeMethod($query, 'buildJoinWith');
|
||||
@@ -164,7 +164,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
*/
|
||||
public function testGetQueryTableName_from_not_set(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$result = $this->invokeMethod($query, 'getTableNameAndAlias');
|
||||
$this->assertEquals(['customer', 'customer'], $result);
|
||||
}
|
||||
@@ -172,14 +172,14 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
public function testGetQueryTableName_from_set(): void
|
||||
{
|
||||
$options = ['from' => ['alias' => 'customer']];
|
||||
$query = new ActiveQuery(Customer::className(), $options);
|
||||
$query = new ActiveQuery(Customer::class, $options);
|
||||
$result = $this->invokeMethod($query, 'getTableNameAndAlias');
|
||||
$this->assertEquals(['customer', 'alias'], $result);
|
||||
}
|
||||
|
||||
public function testOnCondition(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$on = ['active' => true];
|
||||
$params = ['a' => 'b'];
|
||||
$result = $query->onCondition($on, $params);
|
||||
@@ -189,7 +189,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
|
||||
public function testAndOnCondition_on_not_set(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$on = ['active' => true];
|
||||
$params = ['a' => 'b'];
|
||||
$result = $query->andOnCondition($on, $params);
|
||||
@@ -200,7 +200,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
public function testAndOnCondition_on_set(): void
|
||||
{
|
||||
$onOld = ['active' => true];
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$query->on = $onOld;
|
||||
|
||||
$on = ['active' => true];
|
||||
@@ -212,7 +212,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
|
||||
public function testOrOnCondition_on_not_set(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$on = ['active' => true];
|
||||
$params = ['a' => 'b'];
|
||||
$result = $query->orOnCondition($on, $params);
|
||||
@@ -223,7 +223,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
public function testOrOnCondition_on_set(): void
|
||||
{
|
||||
$onOld = ['active' => true];
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$query->on = $onOld;
|
||||
|
||||
$on = ['active' => true];
|
||||
@@ -238,15 +238,15 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
*/
|
||||
public function testViaTable(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className(), ['primaryModel' => new Order()]);
|
||||
$result = $query->viaTable(Profile::className(), ['id' => 'item_id']);
|
||||
$query = new ActiveQuery(Customer::class, ['primaryModel' => new Order()]);
|
||||
$result = $query->viaTable(Profile::class, ['id' => 'item_id']);
|
||||
$this->assertInstanceOf('yii\db\ActiveQuery', $result);
|
||||
$this->assertInstanceOf('yii\db\ActiveQuery', $result->via);
|
||||
}
|
||||
|
||||
public function testAlias_not_set(): void
|
||||
{
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$result = $query->alias('alias');
|
||||
$this->assertInstanceOf('yii\db\ActiveQuery', $result);
|
||||
$this->assertEquals(['alias' => 'customer'], $result->from);
|
||||
@@ -255,7 +255,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
public function testAlias_yet_set(): void
|
||||
{
|
||||
$aliasOld = ['old'];
|
||||
$query = new ActiveQuery(Customer::className());
|
||||
$query = new ActiveQuery(Customer::class);
|
||||
$query->from = $aliasOld;
|
||||
$result = $query->alias('alias');
|
||||
$this->assertInstanceOf('yii\db\ActiveQuery', $result);
|
||||
@@ -269,7 +269,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
|
||||
public function testGetTableNames_notFilledFrom(): void
|
||||
{
|
||||
$query = new ActiveQuery(Profile::className());
|
||||
$query = new ActiveQuery(Profile::class);
|
||||
|
||||
$tables = $query->getTablesUsedInFrom();
|
||||
|
||||
@@ -280,7 +280,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
|
||||
public function testGetTableNames_wontFillFrom(): void
|
||||
{
|
||||
$query = new ActiveQuery(Profile::className());
|
||||
$query = new ActiveQuery(Profile::class);
|
||||
$this->assertEquals($query->from, null);
|
||||
$query->getTablesUsedInFrom();
|
||||
$this->assertEquals($query->from, null);
|
||||
@@ -301,8 +301,8 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
$this->assertNotNull($category);
|
||||
$orders = $category->orders;
|
||||
$this->assertEquals(2, count($orders));
|
||||
$this->assertInstanceOf(Order::className(), $orders[0]);
|
||||
$this->assertInstanceOf(Order::className(), $orders[1]);
|
||||
$this->assertInstanceOf(Order::class, $orders[0]);
|
||||
$this->assertInstanceOf(Order::class, $orders[1]);
|
||||
$ids = [$orders[0]->id, $orders[1]->id];
|
||||
sort($ids);
|
||||
$this->assertEquals([1, 3], $ids);
|
||||
@@ -311,7 +311,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
|
||||
$this->assertNotNull($category);
|
||||
$orders = $category->orders;
|
||||
$this->assertEquals(1, count($orders));
|
||||
$this->assertInstanceOf(Order::className(), $orders[0]);
|
||||
$this->assertInstanceOf(Order::class, $orders[0]);
|
||||
$this->assertEquals(2, $orders[0]->id);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user