Browse Source

update code for 2.1 requirements

tags/3.0.0-alpha1
Paul Klimov 7 years ago
parent
commit
a8b1f69d0c
  1. 2
      framework/base/Component.php
  2. 2
      framework/base/Event.php
  3. 1
      framework/base/InvalidArgumentException.php
  4. 4
      framework/behaviors/CacheableWidgetBehavior.php
  5. 5
      framework/db/BaseActiveRecord.php
  6. 8
      framework/db/QueryBuilder.php
  7. 2
      framework/db/QueryExpressionBuilder.php
  8. 4
      framework/db/Schema.php
  9. 2
      framework/db/conditions/BetweenColumnsConditionBuilder.php
  10. 4
      framework/db/conditions/ConditionInterface.php
  11. 2
      framework/db/conditions/LikeConditionBuilder.php
  12. 6
      framework/db/cubrid/QueryBuilder.php
  13. 6
      framework/db/mssql/QueryBuilder.php
  14. 6
      framework/db/mysql/QueryBuilder.php
  15. 10
      framework/db/oci/QueryBuilder.php
  16. 10
      framework/db/pgsql/QueryBuilder.php
  17. 6
      framework/db/sqlite/QueryBuilder.php
  18. 2
      tests/data/ar/Department.php
  19. 2
      tests/data/ar/Dossier.php
  20. 4
      tests/data/ar/Employee.php
  21. 4
      tests/framework/behaviors/CacheableWidgetBehaviorTest.php
  22. 2
      tests/framework/db/QueryBuilderTest.php
  23. 4
      tests/framework/log/SyslogTargetTest.php
  24. 4
      tests/framework/test/ActiveFixtureTest.php
  25. 2
      tests/framework/web/ErrorHandlerTest.php
  26. 2
      tests/framework/web/UserTest.php

2
framework/base/Component.php

@ -498,7 +498,7 @@ class Component extends BaseObject
* *
* ```php * ```php
* $component->on('event.group.*', function ($event) { * $component->on('event.group.*', function ($event) {
* Yii::trace($event->name . ' is triggered.'); * Yii::debug($event->name . ' is triggered.');
* }); * });
* ``` * ```
* *

2
framework/base/Event.php

@ -84,7 +84,7 @@ class Event extends BaseObject
* *
* ```php * ```php
* Event::on('app\models\db\*', '*Insert', function ($event) { * Event::on('app\models\db\*', '*Insert', function ($event) {
* Yii::trace(get_class($event->sender) . ' is inserted.'); * Yii::debug(get_class($event->sender) . ' is inserted.');
* }); * });
* ``` * ```
* *

1
framework/base/InvalidArgumentException.php

@ -12,7 +12,6 @@ namespace yii\base;
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
* @deprecated since 2.0.14. Use [[InvalidArgumentException]] instead.
*/ */
class InvalidArgumentException extends \BadMethodCallException class InvalidArgumentException extends \BadMethodCallException
{ {

4
framework/behaviors/CacheableWidgetBehavior.php

@ -30,10 +30,10 @@ use yii\di\Instance;
* { * {
* return [ * return [
* [ * [
* 'class' => CacheableWidgetBehavior::className(), * 'class' => CacheableWidgetBehavior::class,
* 'cacheDuration' => 0, * 'cacheDuration' => 0,
* 'cacheDependency' => [ * 'cacheDependency' => [
* 'class' => 'yii\caching\DbDependency', * 'class' => \yii\caching\DbDependency::class,
* 'sql' => 'SELECT MAX(updated_at) FROM posts', * 'sql' => 'SELECT MAX(updated_at) FROM posts',
* ], * ],
* ], * ],

5
framework/db/BaseActiveRecord.php

@ -11,7 +11,6 @@ use Yii;
use yii\base\InvalidArgumentException; use yii\base\InvalidArgumentException;
use yii\base\InvalidCallException; use yii\base\InvalidCallException;
use yii\base\InvalidConfigException; use yii\base\InvalidConfigException;
use yii\base\InvalidParamException;
use yii\base\Model; use yii\base\Model;
use yii\base\ModelEvent; use yii\base\ModelEvent;
use yii\base\NotSupportedException; use yii\base\NotSupportedException;
@ -1235,7 +1234,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
$relation = $this->$getter(); $relation = $this->$getter();
} catch (UnknownMethodException $e) { } catch (UnknownMethodException $e) {
if ($throwException) { 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; return null;
@ -1735,7 +1734,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
} elseif ($relation->via instanceof ActiveQueryInterface) { } elseif ($relation->via instanceof ActiveQueryInterface) {
$this->setRelationDependencies($name, $relation->via); $this->setRelationDependencies($name, $relation->via);
} elseif (is_array($relation->via)) { } elseif (is_array($relation->via)) {
list(, $viaQuery) = $relation->via; [, $viaQuery] = $relation->via;
$this->setRelationDependencies($name, $viaQuery); $this->setRelationDependencies($name, $viaQuery);
} }
} }

8
framework/db/QueryBuilder.php

@ -310,7 +310,7 @@ class QueryBuilder extends \yii\base\BaseObject
*/ */
public function insert($table, $columns, &$params) 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) return 'INSERT INTO ' . $this->db->quoteTableName($table)
. (!empty($names) ? ' (' . implode(', ', $names) . ')' : '') . (!empty($names) ? ' (' . implode(', ', $names) . ')' : '')
. (!empty($placeholders) ? ' VALUES (' . implode(', ', $placeholders) . ')' : $values); . (!empty($placeholders) ? ' VALUES (' . implode(', ', $placeholders) . ')' : $values);
@ -336,7 +336,7 @@ class QueryBuilder extends \yii\base\BaseObject
$placeholders = []; $placeholders = [];
$values = ' DEFAULT VALUES'; $values = ' DEFAULT VALUES';
if ($columns instanceof Query) { if ($columns instanceof Query) {
list($names, $values, $params) = $this->prepareInsertSelectSubQuery($columns, $schema, $params); [$names, $values, $params] = $this->prepareInsertSelectSubQuery($columns, $schema, $params);
} else { } else {
foreach ($columns as $name => $value) { foreach ($columns as $name => $value) {
$names[] = $schema->quoteColumnName($name); $names[] = $schema->quoteColumnName($name);
@ -507,7 +507,7 @@ class QueryBuilder extends \yii\base\BaseObject
protected function prepareUpsertColumns($table, $insertColumns, $updateColumns, &$constraints = []) protected function prepareUpsertColumns($table, $insertColumns, $updateColumns, &$constraints = [])
{ {
if ($insertColumns instanceof Query) { if ($insertColumns instanceof Query) {
list($insertNames) = $this->prepareInsertSelectSubQuery($insertColumns, $this->db->getSchema()); [$insertNames] = $this->prepareInsertSelectSubQuery($insertColumns, $this->db->getSchema());
} else { } else {
$insertNames = array_map([$this->db, 'quoteColumnName'], array_keys($insertColumns)); $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) 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); $sql = 'UPDATE ' . $this->db->quoteTableName($table) . ' SET ' . implode(', ', $lines);
$where = $this->buildWhere($condition, $params); $where = $this->buildWhere($condition, $params);
return $where === '' ? $sql : $sql . ' ' . $where; return $where === '' ? $sql : $sql . ' ' . $where;

2
framework/db/QueryExpressionBuilder.php

@ -29,7 +29,7 @@ class QueryExpressionBuilder implements ExpressionBuilderInterface
*/ */
public function build(ExpressionInterface $expression, array &$params = []) public function build(ExpressionInterface $expression, array &$params = [])
{ {
list($sql, $params) = $this->queryBuilder->build($expression, $params); [$sql, $params] = $this->queryBuilder->build($expression, $params);
return "($sql)"; return "($sql)";
} }

4
framework/db/Schema.php

@ -532,7 +532,7 @@ abstract class Schema extends BaseObject
if (is_string($this->tableQuoteCharacter)) { if (is_string($this->tableQuoteCharacter)) {
$startingCharacter = $endingCharacter = $this->tableQuoteCharacter; $startingCharacter = $endingCharacter = $this->tableQuoteCharacter;
} else { } else {
list($startingCharacter, $endingCharacter) = $this->tableQuoteCharacter; [$startingCharacter, $endingCharacter] = $this->tableQuoteCharacter;
} }
return strpos($name, $startingCharacter) !== false ? $name : $startingCharacter . $name . $endingCharacter; return strpos($name, $startingCharacter) !== false ? $name : $startingCharacter . $name . $endingCharacter;
} }
@ -549,7 +549,7 @@ abstract class Schema extends BaseObject
if (is_string($this->tableQuoteCharacter)) { if (is_string($this->tableQuoteCharacter)) {
$startingCharacter = $endingCharacter = $this->columnQuoteCharacter; $startingCharacter = $endingCharacter = $this->columnQuoteCharacter;
} else { } else {
list($startingCharacter, $endingCharacter) = $this->columnQuoteCharacter; [$startingCharacter, $endingCharacter] = $this->columnQuoteCharacter;
} }
return $name === '*' || strpos($name, $startingCharacter) !== false ? $name : $startingCharacter . $name . $endingCharacter; return $name === '*' || strpos($name, $startingCharacter) !== false ? $name : $startingCharacter . $name . $endingCharacter;
} }

2
framework/db/conditions/BetweenColumnsConditionBuilder.php

@ -52,7 +52,7 @@ class BetweenColumnsConditionBuilder implements ExpressionBuilderInterface
protected function escapeColumnName($columnName, &$params = []) protected function escapeColumnName($columnName, &$params = [])
{ {
if ($columnName instanceof Query) { if ($columnName instanceof Query) {
list($sql, $params) = $this->queryBuilder->build($columnName, $params); [$sql, $params] = $this->queryBuilder->build($columnName, $params);
return "($sql)"; return "($sql)";
} elseif ($columnName instanceof ExpressionInterface) { } elseif ($columnName instanceof ExpressionInterface) {
return $this->queryBuilder->buildExpression($columnName, $params); return $this->queryBuilder->buildExpression($columnName, $params);

4
framework/db/conditions/ConditionInterface.php

@ -7,7 +7,7 @@
namespace yii\db\conditions; namespace yii\db\conditions;
use yii\base\InvalidParamException; use yii\base\InvalidArgumentException;
use yii\db\ExpressionInterface; use yii\db\ExpressionInterface;
/** /**
@ -27,7 +27,7 @@ interface ConditionInterface extends ExpressionInterface
* @param array $operands array of corresponding operands * @param array $operands array of corresponding operands
* *
* @return $this * @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); public static function fromArrayDefinition($operator, $operands);
} }

2
framework/db/conditions/LikeConditionBuilder.php

@ -56,7 +56,7 @@ class LikeConditionBuilder implements ExpressionBuilderInterface
$escape = $this->escapingReplacements; $escape = $this->escapingReplacements;
} }
list($andor, $not, $operator) = $this->parseOperator($operator); [$andor, $not, $operator] = $this->parseOperator($operator);
if (!is_array($values)) { if (!is_array($values)) {
$values = [$values]; $values = [$values];

6
framework/db/cubrid/QueryBuilder.php

@ -66,7 +66,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
public function upsert($table, $insertColumns, $updateColumns, &$params) public function upsert($table, $insertColumns, $updateColumns, &$params)
{ {
/** @var Constraint[] $constraints */ /** @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)) { if (empty($uniqueNames)) {
return $this->insert($table, $insertColumns, $params); return $this->insert($table, $insertColumns, $params);
} }
@ -82,7 +82,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
$onCondition[] = $constraintCondition; $onCondition[] = $constraintCondition;
} }
$on = $this->buildCondition($onCondition, $params); $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) . ' ' $mergeSql = 'MERGE INTO ' . $this->db->quoteTableName($table) . ' '
. 'USING (' . (!empty($placeholders) ? 'VALUES (' . implode(', ', $placeholders) . ')' : ltrim($values, ' ')) . ') AS "EXCLUDED" (' . implode(', ', $insertNames) . ') ' . 'USING (' . (!empty($placeholders) ? 'VALUES (' . implode(', ', $placeholders) . ')' : ltrim($values, ' ')) . ') AS "EXCLUDED" (' . implode(', ', $insertNames) . ') '
. 'ON ' . $on; . 'ON ' . $on;
@ -110,7 +110,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
$updateColumns[$name] = new Expression($quotedName); $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); $updateSql = 'UPDATE SET ' . implode(', ', $updates);
return "$mergeSql WHEN MATCHED THEN $updateSql WHEN NOT MATCHED THEN $insertSql"; return "$mergeSql WHEN MATCHED THEN $updateSql WHEN NOT MATCHED THEN $insertSql";
} }

6
framework/db/mssql/QueryBuilder.php

@ -363,7 +363,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
public function upsert($table, $insertColumns, $updateColumns, &$params) public function upsert($table, $insertColumns, $updateColumns, &$params)
{ {
/** @var Constraint[] $constraints */ /** @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)) { if (empty($uniqueNames)) {
return $this->insert($table, $insertColumns, $params); return $this->insert($table, $insertColumns, $params);
} }
@ -379,7 +379,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
$onCondition[] = $constraintCondition; $onCondition[] = $constraintCondition;
} }
$on = $this->buildCondition($onCondition, $params); $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) ' $mergeSql = 'MERGE ' . $this->db->quoteTableName($table) . ' WITH (HOLDLOCK) '
. 'USING (' . (!empty($placeholders) ? 'VALUES (' . implode(', ', $placeholders) . ')' : ltrim($values, ' ')) . ') AS [EXCLUDED] (' . implode(', ', $insertNames) . ') ' . 'USING (' . (!empty($placeholders) ? 'VALUES (' . implode(', ', $placeholders) . ')' : ltrim($values, ' ')) . ') AS [EXCLUDED] (' . implode(', ', $insertNames) . ') '
. 'ON ' . $on; . 'ON ' . $on;
@ -407,7 +407,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
$updateColumns[$name] = new Expression($quotedName); $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); $updateSql = 'UPDATE SET ' . implode(', ', $updates);
return "$mergeSql WHEN MATCHED THEN $updateSql WHEN NOT MATCHED THEN $insertSql;"; return "$mergeSql WHEN MATCHED THEN $updateSql WHEN NOT MATCHED THEN $insertSql;";
} }

6
framework/db/mysql/QueryBuilder.php

@ -246,7 +246,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
*/ */
protected function prepareInsertValues($table, $columns, $params = []) 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)) { if (!$columns instanceof Query && empty($names)) {
$tableSchema = $this->db->getSchema()->getTableSchema($table); $tableSchema = $this->db->getSchema()->getTableSchema($table);
if ($tableSchema !== null) { if ($tableSchema !== null) {
@ -267,7 +267,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
public function upsert($table, $insertColumns, $updateColumns, &$params) public function upsert($table, $insertColumns, $updateColumns, &$params)
{ {
$insertSql = $this->insert($table, $insertColumns, $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)) { if (empty($uniqueNames)) {
return $insertSql; return $insertSql;
} }
@ -281,7 +281,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
$name = $this->db->quoteColumnName(reset($uniqueNames)); $name = $this->db->quoteColumnName(reset($uniqueNames));
$updateColumns = [$name => new Expression($this->db->quoteTableName($table) . '.' . $name)]; $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); return $insertSql . ' ON DUPLICATE KEY UPDATE ' . implode(', ', $updates);
} }

10
framework/db/oci/QueryBuilder.php

@ -186,7 +186,7 @@ EOD;
*/ */
protected function prepareInsertValues($table, $columns, $params = []) 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)) { if (!$columns instanceof Query && empty($names)) {
$tableSchema = $this->db->getSchema()->getTableSchema($table); $tableSchema = $this->db->getSchema()->getTableSchema($table);
if ($tableSchema !== null) { if ($tableSchema !== null) {
@ -207,7 +207,7 @@ EOD;
public function upsert($table, $insertColumns, $updateColumns, &$params) public function upsert($table, $insertColumns, $updateColumns, &$params)
{ {
/** @var Constraint[] $constraints */ /** @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)) { if (empty($uniqueNames)) {
return $this->insert($table, $insertColumns, $params); return $this->insert($table, $insertColumns, $params);
} }
@ -223,7 +223,7 @@ EOD;
$onCondition[] = $constraintCondition; $onCondition[] = $constraintCondition;
} }
$on = $this->buildCondition($onCondition, $params); $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)) { if (!empty($placeholders)) {
$usingSelectValues = []; $usingSelectValues = [];
foreach ($insertNames as $index => $name) { foreach ($insertNames as $index => $name) {
@ -232,7 +232,7 @@ EOD;
$usingSubQuery = (new Query()) $usingSubQuery = (new Query())
->select($usingSelectValues) ->select($usingSelectValues)
->from('DUAL'); ->from('DUAL');
list($usingValues, $params) = $this->build($usingSubQuery, $params); [$usingValues, $params] = $this->build($usingSubQuery, $params);
} }
$mergeSql = 'MERGE INTO ' . $this->db->quoteTableName($table) . ' ' $mergeSql = 'MERGE INTO ' . $this->db->quoteTableName($table) . ' '
. 'USING (' . (isset($usingValues) ? $usingValues : ltrim($values, ' ')) . ') "EXCLUDED" ' . 'USING (' . (isset($usingValues) ? $usingValues : ltrim($values, ' ')) . ') "EXCLUDED" '
@ -261,7 +261,7 @@ EOD;
$updateColumns[$name] = new Expression($quotedName); $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); $updateSql = 'UPDATE SET ' . implode(', ', $updates);
return "$mergeSql WHEN MATCHED THEN $updateSql WHEN NOT MATCHED THEN $insertSql"; return "$mergeSql WHEN MATCHED THEN $updateSql WHEN NOT MATCHED THEN $insertSql";
} }

10
framework/db/pgsql/QueryBuilder.php

@ -283,7 +283,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
private function newUpsert($table, $insertColumns, $updateColumns, &$params) private function newUpsert($table, $insertColumns, $updateColumns, &$params)
{ {
$insertSql = $this->insert($table, $insertColumns, $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)) { if (empty($uniqueNames)) {
return $insertSql; return $insertSql;
} }
@ -298,7 +298,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
$updateColumns[$name] = new Expression('EXCLUDED.' . $this->db->quoteColumnName($name)); $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); 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) private function oldUpsert($table, $insertColumns, $updateColumns, &$params)
{ {
/** @var Constraint[] $constraints */ /** @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)) { if (empty($uniqueNames)) {
return $this->insert($table, $insertColumns, $params); 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']; $updateCondition = ['or'];
$insertCondition = ['or']; $insertCondition = ['or'];
$quotedTableName = $schema->quoteTableName($table); $quotedTableName = $schema->quoteTableName($table);
@ -373,7 +373,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
$updateColumns[$name] = new Expression($quotedName); $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) $updateSql = 'UPDATE ' . $this->db->quoteTableName($table) . ' SET ' . implode(', ', $updates)
. ' FROM "EXCLUDED" ' . $this->buildWhere($updateCondition, $params) . ' FROM "EXCLUDED" ' . $this->buildWhere($updateCondition, $params)
. ' RETURNING ' . $this->db->quoteTableName($table) .'.*'; . ' RETURNING ' . $this->db->quoteTableName($table) .'.*';

6
framework/db/sqlite/QueryBuilder.php

@ -7,7 +7,7 @@
namespace yii\db\sqlite; namespace yii\db\sqlite;
use yii\base\InvalidParamException; use yii\base\InvalidArgumentException;
use yii\base\NotSupportedException; use yii\base\NotSupportedException;
use yii\db\Connection; use yii\db\Connection;
use yii\db\Constraint; use yii\db\Constraint;
@ -70,12 +70,12 @@ class QueryBuilder extends \yii\db\QueryBuilder
public function upsert($table, $insertColumns, $updateColumns, &$params) public function upsert($table, $insertColumns, $updateColumns, &$params)
{ {
/** @var Constraint[] $constraints */ /** @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)) { if (empty($uniqueNames)) {
return $this->insert($table, $insertColumns, $params); 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) $insertSql = 'INSERT OR IGNORE INTO ' . $this->db->quoteTableName($table)
. (!empty($insertNames) ? ' (' . implode(', ', $insertNames) . ')' : '') . (!empty($insertNames) ? ' (' . implode(', ', $insertNames) . ')' : '')
. (!empty($placeholders) ? ' VALUES (' . implode(', ', $placeholders) . ')' : $values); . (!empty($placeholders) ? ' VALUES (' . implode(', ', $placeholders) . ')' : $values);

2
tests/data/ar/Department.php

@ -39,7 +39,7 @@ class Department extends ActiveRecord
public function getEmployees() public function getEmployees()
{ {
return $this return $this
->hasMany(Employee::className(), [ ->hasMany(Employee::class, [
'department_id' => 'id', 'department_id' => 'id',
]) ])
->inverseOf('department') ->inverseOf('department')

2
tests/data/ar/Dossier.php

@ -41,7 +41,7 @@ class Dossier extends ActiveRecord
public function getEmployee() public function getEmployee()
{ {
return $this return $this
->hasOne(Employee::className(), [ ->hasOne(Employee::class, [
'department_id' => 'department_id', 'department_id' => 'department_id',
'id' => 'employee_id', 'id' => 'employee_id',
]) ])

4
tests/data/ar/Employee.php

@ -55,7 +55,7 @@ class Employee extends ActiveRecord
public function getDepartment() public function getDepartment()
{ {
return $this return $this
->hasOne(Department::className(), [ ->hasOne(Department::class, [
'id' => 'department_id', 'id' => 'department_id',
]) ])
->inverseOf('employees') ->inverseOf('employees')
@ -70,7 +70,7 @@ class Employee extends ActiveRecord
public function getDossier() public function getDossier()
{ {
return $this return $this
->hasOne(Dossier::className(), [ ->hasOne(Dossier::class, [
'department_id' => 'department_id', 'department_id' => 'department_id',
'employee_id' => 'id', 'employee_id' => 'id',
]) ])

4
tests/framework/behaviors/CacheableWidgetBehaviorTest.php

@ -98,8 +98,8 @@ class CacheableWidgetBehaviorTest extends TestCase
*/ */
private function initializeWidgetMocks() private function initializeWidgetMocks()
{ {
$this->simpleWidget = $this->getWidgetMock(SimpleCacheableWidget::className()); $this->simpleWidget = $this->getWidgetMock(SimpleCacheableWidget::class);
$this->dynamicWidget = $this->getWidgetMock(DynamicCacheableWidget::className()); $this->dynamicWidget = $this->getWidgetMock(DynamicCacheableWidget::class);
} }
/** /**

2
tests/framework/db/QueryBuilderTest.php

@ -2372,7 +2372,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
->where([]) ->where([])
->andWhere(['in', 'id', ['1', '0']]); ->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($this->replaceQuotes("SELECT * FROM [[admin_user]] WHERE [[id]] IN (:qp0, :qp1)"), $sql);
$this->assertSame([':qp0' => '1', ':qp1' => '0'], $params); $this->assertSame([':qp0' => '1', ':qp1' => '0'], $params);
} }

4
tests/framework/log/SyslogTargetTest.php

@ -172,12 +172,12 @@ namespace yiiunit\framework\log {
static::$functions['openlog'] = function ($arguments) use ($syslogTarget) { static::$functions['openlog'] = function ($arguments) use ($syslogTarget) {
$this->assertCount(3, $arguments); $this->assertCount(3, $arguments);
list($identity, $option, $facility) = $arguments; [$identity, $option, $facility] = $arguments;
return $syslogTarget->openlog($identity, $option, $facility); return $syslogTarget->openlog($identity, $option, $facility);
}; };
static::$functions['syslog'] = function ($arguments) use ($syslogTarget) { static::$functions['syslog'] = function ($arguments) use ($syslogTarget) {
$this->assertCount(2, $arguments); $this->assertCount(2, $arguments);
list($priority, $message) = $arguments; [$priority, $message] = $arguments;
return $syslogTarget->syslog($priority, $message); return $syslogTarget->syslog($priority, $message);
}; };
static::$functions['closelog'] = function ($arguments) use ($syslogTarget) { static::$functions['closelog'] = function ($arguments) use ($syslogTarget) {

4
tests/framework/test/ActiveFixtureTest.php

@ -64,7 +64,7 @@ class CustomDirectoryDbTestCase extends BaseDbTestCase
public function fixtures() public function fixtures()
{ {
return [ return [
'customers' => CustomDirectoryFixture::className(), 'customers' => CustomDirectoryFixture::class,
]; ];
} }
} }
@ -75,7 +75,7 @@ class DataPathDbTestCase extends BaseDbTestCase
{ {
return [ return [
'customers' => [ 'customers' => [
'class' => CustomDirectoryFixture::className(), 'class' => CustomDirectoryFixture::class,
'dataFile' => '@app/framework/test/data/customer.php' 'dataFile' => '@app/framework/test/data/customer.php'
] ]
]; ];

2
tests/framework/web/ErrorHandlerTest.php

@ -45,7 +45,7 @@ Exception: yii\web\NotFoundHttpException', $out);
$handler->traceLine = '<a href="netbeans://open?file={file}&line={line}">{html}</a>'; $handler->traceLine = '<a href="netbeans://open?file={file}&line={line}">{html}</a>';
$file = \yii\BaseYii::getAlias('@yii/web/Application.php'); $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('<a href="netbeans://open?file=' . $file . '&line=63">', $out); $this->assertContains('<a href="netbeans://open?file=' . $file . '&line=63">', $out);
} }

2
tests/framework/web/UserTest.php

@ -374,7 +374,7 @@ class UserTest extends TestCase
$appConfig = [ $appConfig = [
'components' => [ 'components' => [
'user' => [ 'user' => [
'identityClass' => ExceptionIdentity::className(), 'identityClass' => ExceptionIdentity::class,
], ],
'session' => $session, 'session' => $session,
], ],

Loading…
Cancel
Save