From a8b1f69d0c3a4528ae036837d7a43d400e7dbe02 Mon Sep 17 00:00:00 2001 From: Paul Klimov Date: Tue, 20 Feb 2018 21:57:04 +0200 Subject: [PATCH] update code for 2.1 requirements --- framework/base/Component.php | 2 +- framework/base/Event.php | 2 +- framework/base/InvalidArgumentException.php | 1 - framework/behaviors/CacheableWidgetBehavior.php | 4 ++-- framework/db/BaseActiveRecord.php | 5 ++--- framework/db/QueryBuilder.php | 8 ++++---- framework/db/QueryExpressionBuilder.php | 2 +- framework/db/Schema.php | 4 ++-- framework/db/conditions/BetweenColumnsConditionBuilder.php | 2 +- framework/db/conditions/ConditionInterface.php | 4 ++-- framework/db/conditions/LikeConditionBuilder.php | 2 +- framework/db/cubrid/QueryBuilder.php | 6 +++--- framework/db/mssql/QueryBuilder.php | 6 +++--- framework/db/mysql/QueryBuilder.php | 6 +++--- framework/db/oci/QueryBuilder.php | 10 +++++----- framework/db/pgsql/QueryBuilder.php | 10 +++++----- framework/db/sqlite/QueryBuilder.php | 6 +++--- tests/data/ar/Department.php | 2 +- tests/data/ar/Dossier.php | 2 +- tests/data/ar/Employee.php | 4 ++-- tests/framework/behaviors/CacheableWidgetBehaviorTest.php | 4 ++-- tests/framework/db/QueryBuilderTest.php | 2 +- tests/framework/log/SyslogTargetTest.php | 4 ++-- tests/framework/test/ActiveFixtureTest.php | 4 ++-- tests/framework/web/ErrorHandlerTest.php | 2 +- tests/framework/web/UserTest.php | 2 +- 26 files changed, 52 insertions(+), 54 deletions(-) diff --git a/framework/base/Component.php b/framework/base/Component.php index 25ad4d1..f75f5e3 100644 --- a/framework/base/Component.php +++ b/framework/base/Component.php @@ -498,7 +498,7 @@ class Component extends BaseObject * * ```php * $component->on('event.group.*', function ($event) { - * Yii::trace($event->name . ' is triggered.'); + * Yii::debug($event->name . ' is triggered.'); * }); * ``` * diff --git a/framework/base/Event.php b/framework/base/Event.php index 63b4adb..bdf25a0 100644 --- a/framework/base/Event.php +++ b/framework/base/Event.php @@ -84,7 +84,7 @@ class Event extends BaseObject * * ```php * Event::on('app\models\db\*', '*Insert', function ($event) { - * Yii::trace(get_class($event->sender) . ' is inserted.'); + * Yii::debug(get_class($event->sender) . ' is inserted.'); * }); * ``` * diff --git a/framework/base/InvalidArgumentException.php b/framework/base/InvalidArgumentException.php index 3fe5964..d459f11 100644 --- a/framework/base/InvalidArgumentException.php +++ b/framework/base/InvalidArgumentException.php @@ -12,7 +12,6 @@ namespace yii\base; * * @author Qiang Xue * @since 2.0 - * @deprecated since 2.0.14. Use [[InvalidArgumentException]] instead. */ class InvalidArgumentException extends \BadMethodCallException { diff --git a/framework/behaviors/CacheableWidgetBehavior.php b/framework/behaviors/CacheableWidgetBehavior.php index 17a1050..2d77b96 100644 --- a/framework/behaviors/CacheableWidgetBehavior.php +++ b/framework/behaviors/CacheableWidgetBehavior.php @@ -30,10 +30,10 @@ use yii\di\Instance; * { * return [ * [ - * 'class' => CacheableWidgetBehavior::className(), + * 'class' => CacheableWidgetBehavior::class, * 'cacheDuration' => 0, * 'cacheDependency' => [ - * 'class' => 'yii\caching\DbDependency', + * 'class' => \yii\caching\DbDependency::class, * 'sql' => 'SELECT MAX(updated_at) FROM posts', * ], * ], diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php index 8200417..ab23ec4 100644 --- a/framework/db/BaseActiveRecord.php +++ b/framework/db/BaseActiveRecord.php @@ -11,7 +11,6 @@ use Yii; use yii\base\InvalidArgumentException; use yii\base\InvalidCallException; use yii\base\InvalidConfigException; -use yii\base\InvalidParamException; use yii\base\Model; use yii\base\ModelEvent; use yii\base\NotSupportedException; @@ -1235,7 +1234,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface $relation = $this->$getter(); } catch (UnknownMethodException $e) { if ($throwException) { - throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".', 0, $e); + throw new InvalidArgumentException(get_class($this) . ' has no relation named "' . $name . '".', 0, $e); } return null; @@ -1735,7 +1734,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface } elseif ($relation->via instanceof ActiveQueryInterface) { $this->setRelationDependencies($name, $relation->via); } elseif (is_array($relation->via)) { - list(, $viaQuery) = $relation->via; + [, $viaQuery] = $relation->via; $this->setRelationDependencies($name, $viaQuery); } } diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php index b828989..ddda55e 100644 --- a/framework/db/QueryBuilder.php +++ b/framework/db/QueryBuilder.php @@ -310,7 +310,7 @@ class QueryBuilder extends \yii\base\BaseObject */ public function insert($table, $columns, &$params) { - list($names, $placeholders, $values, $params) = $this->prepareInsertValues($table, $columns, $params); + [$names, $placeholders, $values, $params] = $this->prepareInsertValues($table, $columns, $params); return 'INSERT INTO ' . $this->db->quoteTableName($table) . (!empty($names) ? ' (' . implode(', ', $names) . ')' : '') . (!empty($placeholders) ? ' VALUES (' . implode(', ', $placeholders) . ')' : $values); @@ -336,7 +336,7 @@ class QueryBuilder extends \yii\base\BaseObject $placeholders = []; $values = ' DEFAULT VALUES'; if ($columns instanceof Query) { - list($names, $values, $params) = $this->prepareInsertSelectSubQuery($columns, $schema, $params); + [$names, $values, $params] = $this->prepareInsertSelectSubQuery($columns, $schema, $params); } else { foreach ($columns as $name => $value) { $names[] = $schema->quoteColumnName($name); @@ -507,7 +507,7 @@ class QueryBuilder extends \yii\base\BaseObject protected function prepareUpsertColumns($table, $insertColumns, $updateColumns, &$constraints = []) { if ($insertColumns instanceof Query) { - list($insertNames) = $this->prepareInsertSelectSubQuery($insertColumns, $this->db->getSchema()); + [$insertNames] = $this->prepareInsertSelectSubQuery($insertColumns, $this->db->getSchema()); } else { $insertNames = array_map([$this->db, 'quoteColumnName'], array_keys($insertColumns)); } @@ -590,7 +590,7 @@ class QueryBuilder extends \yii\base\BaseObject */ public function update($table, $columns, $condition, &$params) { - list($lines, $params) = $this->prepareUpdateSets($table, $columns, $params); + [$lines, $params] = $this->prepareUpdateSets($table, $columns, $params); $sql = 'UPDATE ' . $this->db->quoteTableName($table) . ' SET ' . implode(', ', $lines); $where = $this->buildWhere($condition, $params); return $where === '' ? $sql : $sql . ' ' . $where; diff --git a/framework/db/QueryExpressionBuilder.php b/framework/db/QueryExpressionBuilder.php index 3186d2b..937a38d 100644 --- a/framework/db/QueryExpressionBuilder.php +++ b/framework/db/QueryExpressionBuilder.php @@ -29,7 +29,7 @@ class QueryExpressionBuilder implements ExpressionBuilderInterface */ public function build(ExpressionInterface $expression, array &$params = []) { - list($sql, $params) = $this->queryBuilder->build($expression, $params); + [$sql, $params] = $this->queryBuilder->build($expression, $params); return "($sql)"; } diff --git a/framework/db/Schema.php b/framework/db/Schema.php index c0258c5..26eab05 100644 --- a/framework/db/Schema.php +++ b/framework/db/Schema.php @@ -532,7 +532,7 @@ abstract class Schema extends BaseObject if (is_string($this->tableQuoteCharacter)) { $startingCharacter = $endingCharacter = $this->tableQuoteCharacter; } else { - list($startingCharacter, $endingCharacter) = $this->tableQuoteCharacter; + [$startingCharacter, $endingCharacter] = $this->tableQuoteCharacter; } return strpos($name, $startingCharacter) !== false ? $name : $startingCharacter . $name . $endingCharacter; } @@ -549,7 +549,7 @@ abstract class Schema extends BaseObject if (is_string($this->tableQuoteCharacter)) { $startingCharacter = $endingCharacter = $this->columnQuoteCharacter; } else { - list($startingCharacter, $endingCharacter) = $this->columnQuoteCharacter; + [$startingCharacter, $endingCharacter] = $this->columnQuoteCharacter; } return $name === '*' || strpos($name, $startingCharacter) !== false ? $name : $startingCharacter . $name . $endingCharacter; } diff --git a/framework/db/conditions/BetweenColumnsConditionBuilder.php b/framework/db/conditions/BetweenColumnsConditionBuilder.php index 8a55bf4..18638cb 100644 --- a/framework/db/conditions/BetweenColumnsConditionBuilder.php +++ b/framework/db/conditions/BetweenColumnsConditionBuilder.php @@ -52,7 +52,7 @@ class BetweenColumnsConditionBuilder implements ExpressionBuilderInterface protected function escapeColumnName($columnName, &$params = []) { if ($columnName instanceof Query) { - list($sql, $params) = $this->queryBuilder->build($columnName, $params); + [$sql, $params] = $this->queryBuilder->build($columnName, $params); return "($sql)"; } elseif ($columnName instanceof ExpressionInterface) { return $this->queryBuilder->buildExpression($columnName, $params); diff --git a/framework/db/conditions/ConditionInterface.php b/framework/db/conditions/ConditionInterface.php index c3bbc2a..a77454c 100644 --- a/framework/db/conditions/ConditionInterface.php +++ b/framework/db/conditions/ConditionInterface.php @@ -7,7 +7,7 @@ namespace yii\db\conditions; -use yii\base\InvalidParamException; +use yii\base\InvalidArgumentException; use yii\db\ExpressionInterface; /** @@ -27,7 +27,7 @@ interface ConditionInterface extends ExpressionInterface * @param array $operands array of corresponding operands * * @return $this - * @throws InvalidParamException if input parameters are not suitable for this condition + * @throws InvalidArgumentException if input parameters are not suitable for this condition */ public static function fromArrayDefinition($operator, $operands); } diff --git a/framework/db/conditions/LikeConditionBuilder.php b/framework/db/conditions/LikeConditionBuilder.php index 62c3751..9d79492 100644 --- a/framework/db/conditions/LikeConditionBuilder.php +++ b/framework/db/conditions/LikeConditionBuilder.php @@ -56,7 +56,7 @@ class LikeConditionBuilder implements ExpressionBuilderInterface $escape = $this->escapingReplacements; } - list($andor, $not, $operator) = $this->parseOperator($operator); + [$andor, $not, $operator] = $this->parseOperator($operator); if (!is_array($values)) { $values = [$values]; diff --git a/framework/db/cubrid/QueryBuilder.php b/framework/db/cubrid/QueryBuilder.php index 5281f8e..87da696 100644 --- a/framework/db/cubrid/QueryBuilder.php +++ b/framework/db/cubrid/QueryBuilder.php @@ -66,7 +66,7 @@ class QueryBuilder extends \yii\db\QueryBuilder public function upsert($table, $insertColumns, $updateColumns, &$params) { /** @var Constraint[] $constraints */ - list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); + [$uniqueNames, $insertNames, $updateNames] = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); } @@ -82,7 +82,7 @@ class QueryBuilder extends \yii\db\QueryBuilder $onCondition[] = $constraintCondition; } $on = $this->buildCondition($onCondition, $params); - list(, $placeholders, $values, $params) = $this->prepareInsertValues($table, $insertColumns, $params); + [, $placeholders, $values, $params] = $this->prepareInsertValues($table, $insertColumns, $params); $mergeSql = 'MERGE INTO ' . $this->db->quoteTableName($table) . ' ' . 'USING (' . (!empty($placeholders) ? 'VALUES (' . implode(', ', $placeholders) . ')' : ltrim($values, ' ')) . ') AS "EXCLUDED" (' . implode(', ', $insertNames) . ') ' . 'ON ' . $on; @@ -110,7 +110,7 @@ class QueryBuilder extends \yii\db\QueryBuilder $updateColumns[$name] = new Expression($quotedName); } } - list($updates, $params) = $this->prepareUpdateSets($table, $updateColumns, $params); + [$updates, $params] = $this->prepareUpdateSets($table, $updateColumns, $params); $updateSql = 'UPDATE SET ' . implode(', ', $updates); return "$mergeSql WHEN MATCHED THEN $updateSql WHEN NOT MATCHED THEN $insertSql"; } diff --git a/framework/db/mssql/QueryBuilder.php b/framework/db/mssql/QueryBuilder.php index b61bf75..755c5c6 100644 --- a/framework/db/mssql/QueryBuilder.php +++ b/framework/db/mssql/QueryBuilder.php @@ -363,7 +363,7 @@ class QueryBuilder extends \yii\db\QueryBuilder public function upsert($table, $insertColumns, $updateColumns, &$params) { /** @var Constraint[] $constraints */ - list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); + [$uniqueNames, $insertNames, $updateNames] = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); } @@ -379,7 +379,7 @@ class QueryBuilder extends \yii\db\QueryBuilder $onCondition[] = $constraintCondition; } $on = $this->buildCondition($onCondition, $params); - list(, $placeholders, $values, $params) = $this->prepareInsertValues($table, $insertColumns, $params); + [, $placeholders, $values, $params] = $this->prepareInsertValues($table, $insertColumns, $params); $mergeSql = 'MERGE ' . $this->db->quoteTableName($table) . ' WITH (HOLDLOCK) ' . 'USING (' . (!empty($placeholders) ? 'VALUES (' . implode(', ', $placeholders) . ')' : ltrim($values, ' ')) . ') AS [EXCLUDED] (' . implode(', ', $insertNames) . ') ' . 'ON ' . $on; @@ -407,7 +407,7 @@ class QueryBuilder extends \yii\db\QueryBuilder $updateColumns[$name] = new Expression($quotedName); } } - list($updates, $params) = $this->prepareUpdateSets($table, $updateColumns, $params); + [$updates, $params] = $this->prepareUpdateSets($table, $updateColumns, $params); $updateSql = 'UPDATE SET ' . implode(', ', $updates); return "$mergeSql WHEN MATCHED THEN $updateSql WHEN NOT MATCHED THEN $insertSql;"; } diff --git a/framework/db/mysql/QueryBuilder.php b/framework/db/mysql/QueryBuilder.php index fca872c..445c7d5 100644 --- a/framework/db/mysql/QueryBuilder.php +++ b/framework/db/mysql/QueryBuilder.php @@ -246,7 +246,7 @@ class QueryBuilder extends \yii\db\QueryBuilder */ protected function prepareInsertValues($table, $columns, $params = []) { - list($names, $placeholders, $values, $params) = parent::prepareInsertValues($table, $columns, $params); + [$names, $placeholders, $values, $params] = parent::prepareInsertValues($table, $columns, $params); if (!$columns instanceof Query && empty($names)) { $tableSchema = $this->db->getSchema()->getTableSchema($table); if ($tableSchema !== null) { @@ -267,7 +267,7 @@ class QueryBuilder extends \yii\db\QueryBuilder public function upsert($table, $insertColumns, $updateColumns, &$params) { $insertSql = $this->insert($table, $insertColumns, $params); - list($uniqueNames, , $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns); + [$uniqueNames, , $updateNames] = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns); if (empty($uniqueNames)) { return $insertSql; } @@ -281,7 +281,7 @@ class QueryBuilder extends \yii\db\QueryBuilder $name = $this->db->quoteColumnName(reset($uniqueNames)); $updateColumns = [$name => new Expression($this->db->quoteTableName($table) . '.' . $name)]; } - list($updates, $params) = $this->prepareUpdateSets($table, $updateColumns, $params); + [$updates, $params] = $this->prepareUpdateSets($table, $updateColumns, $params); return $insertSql . ' ON DUPLICATE KEY UPDATE ' . implode(', ', $updates); } diff --git a/framework/db/oci/QueryBuilder.php b/framework/db/oci/QueryBuilder.php index 829b1f1..852d6c5 100644 --- a/framework/db/oci/QueryBuilder.php +++ b/framework/db/oci/QueryBuilder.php @@ -186,7 +186,7 @@ EOD; */ protected function prepareInsertValues($table, $columns, $params = []) { - list($names, $placeholders, $values, $params) = parent::prepareInsertValues($table, $columns, $params); + [$names, $placeholders, $values, $params] = parent::prepareInsertValues($table, $columns, $params); if (!$columns instanceof Query && empty($names)) { $tableSchema = $this->db->getSchema()->getTableSchema($table); if ($tableSchema !== null) { @@ -207,7 +207,7 @@ EOD; public function upsert($table, $insertColumns, $updateColumns, &$params) { /** @var Constraint[] $constraints */ - list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); + [$uniqueNames, $insertNames, $updateNames] = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); } @@ -223,7 +223,7 @@ EOD; $onCondition[] = $constraintCondition; } $on = $this->buildCondition($onCondition, $params); - list(, $placeholders, $values, $params) = $this->prepareInsertValues($table, $insertColumns, $params); + [, $placeholders, $values, $params] = $this->prepareInsertValues($table, $insertColumns, $params); if (!empty($placeholders)) { $usingSelectValues = []; foreach ($insertNames as $index => $name) { @@ -232,7 +232,7 @@ EOD; $usingSubQuery = (new Query()) ->select($usingSelectValues) ->from('DUAL'); - list($usingValues, $params) = $this->build($usingSubQuery, $params); + [$usingValues, $params] = $this->build($usingSubQuery, $params); } $mergeSql = 'MERGE INTO ' . $this->db->quoteTableName($table) . ' ' . 'USING (' . (isset($usingValues) ? $usingValues : ltrim($values, ' ')) . ') "EXCLUDED" ' @@ -261,7 +261,7 @@ EOD; $updateColumns[$name] = new Expression($quotedName); } } - list($updates, $params) = $this->prepareUpdateSets($table, $updateColumns, $params); + [$updates, $params] = $this->prepareUpdateSets($table, $updateColumns, $params); $updateSql = 'UPDATE SET ' . implode(', ', $updates); return "$mergeSql WHEN MATCHED THEN $updateSql WHEN NOT MATCHED THEN $insertSql"; } diff --git a/framework/db/pgsql/QueryBuilder.php b/framework/db/pgsql/QueryBuilder.php index acf4031..85c2d69 100644 --- a/framework/db/pgsql/QueryBuilder.php +++ b/framework/db/pgsql/QueryBuilder.php @@ -283,7 +283,7 @@ class QueryBuilder extends \yii\db\QueryBuilder private function newUpsert($table, $insertColumns, $updateColumns, &$params) { $insertSql = $this->insert($table, $insertColumns, $params); - list($uniqueNames, , $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns); + [$uniqueNames, , $updateNames] = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns); if (empty($uniqueNames)) { return $insertSql; } @@ -298,7 +298,7 @@ class QueryBuilder extends \yii\db\QueryBuilder $updateColumns[$name] = new Expression('EXCLUDED.' . $this->db->quoteColumnName($name)); } } - list($updates, $params) = $this->prepareUpdateSets($table, $updateColumns, $params); + [$updates, $params] = $this->prepareUpdateSets($table, $updateColumns, $params); return $insertSql . ' ON CONFLICT (' . implode(', ', $uniqueNames) . ') DO UPDATE SET ' . implode(', ', $updates); } @@ -313,7 +313,7 @@ class QueryBuilder extends \yii\db\QueryBuilder private function oldUpsert($table, $insertColumns, $updateColumns, &$params) { /** @var Constraint[] $constraints */ - list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); + [$uniqueNames, $insertNames, $updateNames] = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); } @@ -333,7 +333,7 @@ class QueryBuilder extends \yii\db\QueryBuilder } } } - list(, $placeholders, $values, $params) = $this->prepareInsertValues($table, $insertColumns, $params); + [, $placeholders, $values, $params] = $this->prepareInsertValues($table, $insertColumns, $params); $updateCondition = ['or']; $insertCondition = ['or']; $quotedTableName = $schema->quoteTableName($table); @@ -373,7 +373,7 @@ class QueryBuilder extends \yii\db\QueryBuilder $updateColumns[$name] = new Expression($quotedName); } } - list($updates, $params) = $this->prepareUpdateSets($table, $updateColumns, $params); + [$updates, $params] = $this->prepareUpdateSets($table, $updateColumns, $params); $updateSql = 'UPDATE ' . $this->db->quoteTableName($table) . ' SET ' . implode(', ', $updates) . ' FROM "EXCLUDED" ' . $this->buildWhere($updateCondition, $params) . ' RETURNING ' . $this->db->quoteTableName($table) .'.*'; diff --git a/framework/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php index 21440b7..4b7c145 100644 --- a/framework/db/sqlite/QueryBuilder.php +++ b/framework/db/sqlite/QueryBuilder.php @@ -7,7 +7,7 @@ namespace yii\db\sqlite; -use yii\base\InvalidParamException; +use yii\base\InvalidArgumentException; use yii\base\NotSupportedException; use yii\db\Connection; use yii\db\Constraint; @@ -70,12 +70,12 @@ class QueryBuilder extends \yii\db\QueryBuilder public function upsert($table, $insertColumns, $updateColumns, &$params) { /** @var Constraint[] $constraints */ - list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); + [$uniqueNames, $insertNames, $updateNames] = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); } - list(, $placeholders, $values, $params) = $this->prepareInsertValues($table, $insertColumns, $params); + [, $placeholders, $values, $params] = $this->prepareInsertValues($table, $insertColumns, $params); $insertSql = 'INSERT OR IGNORE INTO ' . $this->db->quoteTableName($table) . (!empty($insertNames) ? ' (' . implode(', ', $insertNames) . ')' : '') . (!empty($placeholders) ? ' VALUES (' . implode(', ', $placeholders) . ')' : $values); diff --git a/tests/data/ar/Department.php b/tests/data/ar/Department.php index 3d168e6..26630be 100644 --- a/tests/data/ar/Department.php +++ b/tests/data/ar/Department.php @@ -39,7 +39,7 @@ class Department extends ActiveRecord public function getEmployees() { return $this - ->hasMany(Employee::className(), [ + ->hasMany(Employee::class, [ 'department_id' => 'id', ]) ->inverseOf('department') diff --git a/tests/data/ar/Dossier.php b/tests/data/ar/Dossier.php index d5900f0..462d77a 100644 --- a/tests/data/ar/Dossier.php +++ b/tests/data/ar/Dossier.php @@ -41,7 +41,7 @@ class Dossier extends ActiveRecord public function getEmployee() { return $this - ->hasOne(Employee::className(), [ + ->hasOne(Employee::class, [ 'department_id' => 'department_id', 'id' => 'employee_id', ]) diff --git a/tests/data/ar/Employee.php b/tests/data/ar/Employee.php index faec8fb..0b79ce0 100644 --- a/tests/data/ar/Employee.php +++ b/tests/data/ar/Employee.php @@ -55,7 +55,7 @@ class Employee extends ActiveRecord public function getDepartment() { return $this - ->hasOne(Department::className(), [ + ->hasOne(Department::class, [ 'id' => 'department_id', ]) ->inverseOf('employees') @@ -70,7 +70,7 @@ class Employee extends ActiveRecord public function getDossier() { return $this - ->hasOne(Dossier::className(), [ + ->hasOne(Dossier::class, [ 'department_id' => 'department_id', 'employee_id' => 'id', ]) diff --git a/tests/framework/behaviors/CacheableWidgetBehaviorTest.php b/tests/framework/behaviors/CacheableWidgetBehaviorTest.php index 0ae106a..ec5137e 100644 --- a/tests/framework/behaviors/CacheableWidgetBehaviorTest.php +++ b/tests/framework/behaviors/CacheableWidgetBehaviorTest.php @@ -98,8 +98,8 @@ class CacheableWidgetBehaviorTest extends TestCase */ private function initializeWidgetMocks() { - $this->simpleWidget = $this->getWidgetMock(SimpleCacheableWidget::className()); - $this->dynamicWidget = $this->getWidgetMock(DynamicCacheableWidget::className()); + $this->simpleWidget = $this->getWidgetMock(SimpleCacheableWidget::class); + $this->dynamicWidget = $this->getWidgetMock(DynamicCacheableWidget::class); } /** diff --git a/tests/framework/db/QueryBuilderTest.php b/tests/framework/db/QueryBuilderTest.php index 36d4419..9e9b9fb 100644 --- a/tests/framework/db/QueryBuilderTest.php +++ b/tests/framework/db/QueryBuilderTest.php @@ -2372,7 +2372,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->where([]) ->andWhere(['in', 'id', ['1', '0']]); - list($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $this->assertSame($this->replaceQuotes("SELECT * FROM [[admin_user]] WHERE [[id]] IN (:qp0, :qp1)"), $sql); $this->assertSame([':qp0' => '1', ':qp1' => '0'], $params); } diff --git a/tests/framework/log/SyslogTargetTest.php b/tests/framework/log/SyslogTargetTest.php index 3059810..77626ef 100644 --- a/tests/framework/log/SyslogTargetTest.php +++ b/tests/framework/log/SyslogTargetTest.php @@ -172,12 +172,12 @@ namespace yiiunit\framework\log { static::$functions['openlog'] = function ($arguments) use ($syslogTarget) { $this->assertCount(3, $arguments); - list($identity, $option, $facility) = $arguments; + [$identity, $option, $facility] = $arguments; return $syslogTarget->openlog($identity, $option, $facility); }; static::$functions['syslog'] = function ($arguments) use ($syslogTarget) { $this->assertCount(2, $arguments); - list($priority, $message) = $arguments; + [$priority, $message] = $arguments; return $syslogTarget->syslog($priority, $message); }; static::$functions['closelog'] = function ($arguments) use ($syslogTarget) { diff --git a/tests/framework/test/ActiveFixtureTest.php b/tests/framework/test/ActiveFixtureTest.php index f6d2432..07c9b2b 100644 --- a/tests/framework/test/ActiveFixtureTest.php +++ b/tests/framework/test/ActiveFixtureTest.php @@ -64,7 +64,7 @@ class CustomDirectoryDbTestCase extends BaseDbTestCase public function fixtures() { return [ - 'customers' => CustomDirectoryFixture::className(), + 'customers' => CustomDirectoryFixture::class, ]; } } @@ -75,7 +75,7 @@ class DataPathDbTestCase extends BaseDbTestCase { return [ 'customers' => [ - 'class' => CustomDirectoryFixture::className(), + 'class' => CustomDirectoryFixture::class, 'dataFile' => '@app/framework/test/data/customer.php' ] ]; diff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php index 63ef0de..81854b2 100644 --- a/tests/framework/web/ErrorHandlerTest.php +++ b/tests/framework/web/ErrorHandlerTest.php @@ -45,7 +45,7 @@ Exception: yii\web\NotFoundHttpException', $out); $handler->traceLine = '{html}'; $file = \yii\BaseYii::getAlias('@yii/web/Application.php'); - $out = $handler->renderCallStackItem($file, 63, \yii\web\Application::className(), null, null, null); + $out = $handler->renderCallStackItem($file, 63, \yii\web\Application::class, null, null, null); $this->assertContains('', $out); } diff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php index 62034a9..064d3a2 100644 --- a/tests/framework/web/UserTest.php +++ b/tests/framework/web/UserTest.php @@ -374,7 +374,7 @@ class UserTest extends TestCase $appConfig = [ 'components' => [ 'user' => [ - 'identityClass' => ExceptionIdentity::className(), + 'identityClass' => ExceptionIdentity::class, ], 'session' => $session, ],