Error202
/
yii2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Replaced all `::className()` calls to `::class`

tags/3.0.0-alpha1
SilverFire - Dmitry Naumenko 8 years ago
parent
1e24d9a92e
commit
76e6a20cee
8 changed files with 37 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      framework/console/controllers/MigrateController.php
  2. 2
      framework/filters/auth/HttpBasicAuth.php
  3. 4
      framework/web/View.php
  4. 6
      tests/framework/caching/DependencyTest.php
  5. 44
      tests/framework/db/ActiveQueryTest.php
  6. 6
      tests/framework/filters/auth/AuthMethodTest.php
  7. 4
      tests/framework/grid/GridViewTest.php
  8. 4
      tests/framework/rbac/ManagerTestCase.php

2
framework/console/controllers/MigrateController.php
Unescape View File

@ -323,7 +323,7 @@ class MigrateController extends BaseMigrateController
if ($relatedColumn === null) {
$relatedColumn = 'id';
try {
$this->db = Instance::ensure($this->db, Connection::className());
$this->db = Instance::ensure($this->db, Connection::class);
$relatedTableSchema = $this->db->getTableSchema($relatedTable);
if ($relatedTableSchema !== null) {
$primaryKeyCount = count($relatedTableSchema->primaryKey);

2
framework/filters/auth/HttpBasicAuth.php
Unescape View File

@ -34,7 +34,7 @@ namespace yii\filters\auth;
* {
* return [
* 'basicAuth' => [
* 'class' => \yii\filters\auth\HttpBasicAuth::className(),
* 'class' => \yii\filters\auth\HttpBasicAuth::class,
* 'auth' => function ($username, $password) {
* $user = User::find()->where(['username' => $username])->one();
* if ($user->verifyPassword($password)) {

4
framework/web/View.php
Unescape View File

@ -407,7 +407,7 @@ class View extends \yii\base\View
$this->cssFiles[$key] = Html::cssFile($url, $options);
} else {
$this->getAssetManager()->bundles[$key] = Yii::createObject([
'class' => AssetBundle::className(),
'class' => AssetBundle::class,
'baseUrl' => '',
'css' => [strncmp($url, '//', 2) === 0 ? $url : ltrim($url, '/')],
'cssOptions' => $options,
@ -475,7 +475,7 @@ class View extends \yii\base\View
$this->jsFiles[$position][$key] = Html::jsFile($url, $options);
} else {
$this->getAssetManager()->bundles[$key] = Yii::createObject([
'class' => AssetBundle::className(),
'class' => AssetBundle::class,
'baseUrl' => '',
'js' => [strncmp($url, '//', 2) === 0 ? $url : ltrim($url, '/')],
'jsOptions' => $options,

6
tests/framework/caching/DependencyTest.php
Unescape View File

@ -29,7 +29,7 @@ class DependencyTest extends TestCase
public function testGenerateReusableHash()
{
$dependency = $this->getMockForAbstractClass(Dependency::className());
$dependency = $this->getMockForAbstractClass(Dependency::class);
$dependency->data = 'dummy';
$result = $this->invokeMethod($dependency, 'generateReusableHash');
@ -39,8 +39,8 @@ class DependencyTest extends TestCase
public function testisChanged()
{
$dependency = $this->getMockForAbstractClass(Dependency::className());
$cache = $this->getMockForAbstractClass(Cache::className());
$dependency = $this->getMockForAbstractClass(Dependency::class);
$cache = $this->getMockForAbstractClass(Cache::class);
$result = $dependency->isChanged($cache);
$this->assertFalse($result);

44
tests/framework/db/ActiveQueryTest.php
Unescape View File

@ -27,8 +27,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']);
}
@ -39,10 +39,10 @@ abstract class ActiveQueryTest extends DatabaseTestCase
$callback = function (\yii\base\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);
}
/**
@ -50,7 +50,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
*/
public function testPrepare()
{
$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);
@ -58,7 +58,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
public function testPopulate_EmptyRows()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$rows = [];
$result = $query->populate([]);
$this->assertEquals($rows, $result);
@ -69,7 +69,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
*/
public function testPopulate_FilledRows()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$rows = $query->all();
$result = $query->populate($rows);
$this->assertEquals($rows, $result);
@ -80,7 +80,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
*/
public function testOne()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$result = $query->one();
$this->assertInstanceOf('yiiunit\data\ar\Customer', $result);
}
@ -90,7 +90,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
*/
public function testCreateCommand()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$result = $query->createCommand();
$this->assertInstanceOf('yii\db\Command', $result);
}
@ -100,7 +100,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
*/
public function testQueryScalar()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$result = $this->invokeMethod($query, 'queryScalar', ['name', null]);
$this->assertEquals('user1', $result);
}
@ -110,7 +110,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
*/
public function testJoinWith()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$result = $query->joinWith('profile');
$this->assertEquals([
[['profile'], true, 'LEFT JOIN']
@ -122,7 +122,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
*/
public function testInnerJoinWith()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$result = $query->innerJoinWith('profile');
$this->assertEquals([
[['profile'], true, 'INNER JOIN']
@ -131,7 +131,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
public function testOnCondition()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$on = ['active' => true];
$params = ['a' => 'b'];
$result = $query->onCondition($on, $params);
@ -141,7 +141,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
public function testAndOnCondition_OnIsNull()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$on = ['active' => true];
$params = ['a' => 'b'];
$result = $query->andOnCondition($on, $params);
@ -152,7 +152,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
public function testAndOnCondition_OnIsNotNull()
{
$onOld = ['active' => true];
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$query->on = $onOld;
$on = ['active' => true];
@ -164,7 +164,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
public function testOrOnCondition_OnIsNull()
{
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$on = ['active' => true];
$params = ['a' => 'b'];
$result = $query->orOnCondition($on, $params);
@ -175,7 +175,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
public function testOrOnCondition_OnIsNotNull()
{
$onOld = ['active' => true];
$query = new ActiveQuery(Customer::className());
$query = new ActiveQuery(Customer::class);
$query->on = $onOld;
$on = ['active' => true];
@ -190,15 +190,15 @@ abstract class ActiveQueryTest extends DatabaseTestCase
*/
public function testViaTable()
{
$query = new ActiveQuery(Customer::className());
$result = $query->viaTable(Profile::className(), ['id' => 'item_id']);
$query = new ActiveQuery(Customer::class);
$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()
{
$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);
@ -207,7 +207,7 @@ abstract class ActiveQueryTest extends DatabaseTestCase
public function testAlias_yet_set()
{
$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);

6
tests/framework/filters/auth/AuthMethodTest.php
Unescape View File

@ -18,7 +18,7 @@ class AuthMethodTest extends TestCase
$this->mockWebApplication([
'components' => [
'user' => [
'identityClass' => UserIdentity::className()
'identityClass' => UserIdentity::class
],
]
]);
@ -31,7 +31,7 @@ class AuthMethodTest extends TestCase
*/
protected function createFilter($authenticateCallback)
{
$filter = $this->getMock(AuthMethod::className(), ['authenticate']);
$filter = $this->getMock(AuthMethod::class, ['authenticate']);
$filter->method('authenticate')->willReturnCallback($authenticateCallback);
return $filter;
@ -64,7 +64,7 @@ class AuthMethodTest extends TestCase
public function testIsOptional()
{
$reflection = new \ReflectionClass(AuthMethod::className());
$reflection = new \ReflectionClass(AuthMethod::class);
$method = $reflection->getMethod('isOptional');
$method->setAccessible(true);

4
tests/framework/grid/GridViewTest.php
Unescape View File

@ -32,7 +32,7 @@ class GridViewTest extends \yiiunit\TestCase
$this->assertCount(count($row), $columns);
foreach ($columns as $index => $column) {
$this->assertInstanceOf(DataColumn::className(), $column);
$this->assertInstanceOf(DataColumn::class, $column);
$this->assertArrayHasKey($column->attribute, $row);
}
@ -53,7 +53,7 @@ class GridViewTest extends \yiiunit\TestCase
$this->assertCount(count($row) - 2, $columns);
foreach ($columns as $index => $column) {
$this->assertInstanceOf(DataColumn::className(), $column);
$this->assertInstanceOf(DataColumn::class, $column);
$this->assertArrayHasKey($column->attribute, $row);
$this->assertNotEquals('relation', $column->attribute);
$this->assertNotEquals('otherRelation', $column->attribute);

4
tests/framework/rbac/ManagerTestCase.php
Unescape View File

@ -297,12 +297,12 @@ abstract class ManagerTestCase extends TestCase
$roles = $this->auth->getChildRoles('withoutChildren');
$this->assertCount(1, $roles);
$this->assertInstanceOf(Role::className(), reset($roles));
$this->assertInstanceOf(Role::class, reset($roles));
$this->assertTrue(reset($roles)->name === 'withoutChildren');
$roles = $this->auth->getChildRoles('reader');
$this->assertCount(1, $roles);
$this->assertInstanceOf(Role::className(), reset($roles));
$this->assertInstanceOf(Role::class, reset($roles));
$this->assertTrue(reset($roles)->name === 'reader');
$roles = $this->auth->getChildRoles('author');

Write Preview
Loading…
Cancel
Save