From 01174594449be20e0357173c265bd121073d32f5 Mon Sep 17 00:00:00 2001 From: Angel Guevara Date: Sat, 10 Jun 2017 06:02:40 -0500 Subject: [PATCH] Used PHP 7 list syntax where appropriate --- .travis.yml | 3 -- build/controllers/PhpDocController.php | 6 +-- build/controllers/ReleaseController.php | 2 +- composer.json | 4 +- framework/base/Module.php | 4 +- framework/base/Security.php | 4 +- framework/captcha/CaptchaValidator.php | 2 +- framework/console/Application.php | 2 +- framework/console/UnknownCommandException.php | 4 +- .../console/controllers/BaseMigrateController.php | 2 +- framework/console/controllers/HelpController.php | 14 +++--- framework/console/controllers/ServeController.php | 2 +- framework/db/ActiveQuery.php | 17 +++---- framework/db/ActiveRelationTrait.php | 2 +- framework/db/BaseActiveRecord.php | 6 +-- framework/db/Query.php | 2 +- framework/db/QueryBuilder.php | 28 +++++------ framework/db/mysql/QueryBuilder.php | 4 +- framework/db/oci/QueryBuilder.php | 4 +- framework/db/sqlite/QueryBuilder.php | 2 +- framework/di/Container.php | 2 +- framework/filters/RateLimiter.php | 4 +- framework/helpers/BaseArrayHelper.php | 3 +- framework/helpers/BaseConsole.php | 2 +- framework/i18n/Formatter.php | 6 +-- framework/log/DbTarget.php | 2 +- framework/log/Logger.php | 6 +-- framework/log/SyslogTarget.php | 2 +- framework/log/Target.php | 2 +- framework/mutex/PgsqlMutex.php | 4 +- framework/rbac/DbManager.php | 2 +- framework/rest/Serializer.php | 4 +- framework/validators/ImageValidator.php | 2 +- framework/validators/IpValidator.php | 6 +-- framework/validators/Validator.php | 2 +- framework/web/Application.php | 2 +- framework/web/AssetBundle.php | 2 +- framework/web/AssetConverter.php | 2 +- framework/web/MultipartFormDataParser.php | 6 +-- framework/web/Request.php | 4 +- framework/web/Response.php | 6 +-- framework/web/User.php | 2 +- framework/widgets/LinkPager.php | 2 +- tests/framework/console/ControllerTest.php | 6 +-- tests/framework/console/RequestTest.php | 2 +- tests/framework/db/DatabaseTestCase.php | 4 +- tests/framework/db/QueryBuilderTest.php | 57 +++++++++++----------- tests/framework/db/mssql/QueryBuilderTest.php | 6 +-- .../framework/db/mysql/connection/DeadLockTest.php | 4 +- tests/framework/db/sqlite/ConnectionTest.php | 4 +- tests/framework/db/sqlite/QueryBuilderTest.php | 2 +- tests/framework/di/ContainerTest.php | 2 +- tests/framework/log/SyslogTargetTest.php | 4 +- tests/framework/rest/UrlRuleTest.php | 20 +++----- tests/framework/web/ControllerTest.php | 4 +- tests/framework/web/GroupUrlRuleTest.php | 13 ++--- tests/framework/web/UrlRuleTest.php | 44 ++++++----------- 57 files changed, 166 insertions(+), 195 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a7edb3..4169e82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,6 @@ sudo: false language: php php: - - 5.5 - - 5.6 - - 7.0 - 7.1 - nightly diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php index bb01fa5..9c3f76b 100644 --- a/build/controllers/PhpDocController.php +++ b/build/controllers/PhpDocController.php @@ -52,7 +52,7 @@ class PhpDocController extends Controller foreach ($files as $file) { $result = $this->generateClassPropertyDocs($file); if ($result !== false) { - list($className, $phpdoc) = $result; + [$className, $phpdoc] = $result; if ($this->updateFiles) { if ($this->updateClassPropertyDocs($file, $className, $phpdoc)) { $nFilesUpdated++; @@ -177,7 +177,7 @@ class PhpDocController extends Controller $extensionPath = dirname(rtrim($root, '\\/')); $this->setUpExtensionAliases($extensionPath); - list(, $extension) = $matches; + $extension = $matches[1]; Yii::setAlias("@yii/$extension", "$root"); if (is_file($autoloadFile = Yii::getAlias("@yii/$extension/vendor/autoload.php"))) { include($autoloadFile); @@ -201,7 +201,7 @@ class PhpDocController extends Controller $extensionPath = dirname(dirname(rtrim($root, '\\/'))) . '/extensions'; $this->setUpExtensionAliases($extensionPath); - list(, $appName) = $matches; + $appName = $matches[1]; Yii::setAlias("@app-$appName", "$root"); if (is_file($autoloadFile = Yii::getAlias("@app-$appName/vendor/autoload.php"))) { include($autoloadFile); diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php index 06674a3..db57fd2 100644 --- a/build/controllers/ReleaseController.php +++ b/build/controllers/ReleaseController.php @@ -841,7 +841,7 @@ class ReleaseController extends Controller { foreach ($this->getChangelogs($what) as $file) { // split the file into relevant parts - list($start, $changelog, $end) = $this->splitChangelog($file, $version); + [$start, $changelog, $end] = $this->splitChangelog($file, $version); $changelog = $this->resortChangelog($changelog); file_put_contents($file, implode("\n", array_merge($start, $changelog, $end))); } diff --git a/composer.json b/composer.json index 41bfdbe..cb43799 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "yiisoft/yii2": "self.version" }, "require": { - "php": ">=5.5.0", + "php": ">=7.1.0", "ext-mbstring": "*", "ext-ctype": "*", "lib-pcre": "*", @@ -99,7 +99,7 @@ } }, "config": { - "platform": {"php": "5.5"} + "platform": {"php": "7.1"} }, "bin": [ "framework/yii" diff --git a/framework/base/Module.php b/framework/base/Module.php index cf3b2ae..709eef1 100644 --- a/framework/base/Module.php +++ b/framework/base/Module.php @@ -517,7 +517,7 @@ class Module extends ServiceLocator $parts = $this->createController($route); if (is_array($parts)) { /* @var $controller Controller */ - list($controller, $actionID) = $parts; + [$controller, $actionID] = $parts; $oldController = Yii::$app->controller; Yii::$app->controller = $controller; $result = $controller->runAction($actionID, $params); @@ -567,7 +567,7 @@ class Module extends ServiceLocator } if (strpos($route, '/') !== false) { - list($id, $route) = explode('/', $route, 2); + [$id, $route] = explode('/', $route, 2); } else { $id = $route; $route = ''; diff --git a/framework/base/Security.php b/framework/base/Security.php index f245528..da7dd88 100644 --- a/framework/base/Security.php +++ b/framework/base/Security.php @@ -180,7 +180,7 @@ class Security extends Component throw new InvalidConfigException($this->cipher . ' is not an allowed cipher'); } - list($blockSize, $keySize) = $this->allowedCiphers[$this->cipher]; + [$blockSize, $keySize] = $this->allowedCiphers[$this->cipher]; $keySalt = $this->generateRandomKey($keySize); if ($passwordBased) { @@ -230,7 +230,7 @@ class Security extends Component throw new InvalidConfigException($this->cipher . ' is not an allowed cipher'); } - list($blockSize, $keySize) = $this->allowedCiphers[$this->cipher]; + [$blockSize, $keySize] = $this->allowedCiphers[$this->cipher]; $keySalt = StringHelper::byteSubstr($data, 0, $keySize); if ($passwordBased) { diff --git a/framework/captcha/CaptchaValidator.php b/framework/captcha/CaptchaValidator.php index 357a81b..965f75b 100644 --- a/framework/captcha/CaptchaValidator.php +++ b/framework/captcha/CaptchaValidator.php @@ -72,7 +72,7 @@ class CaptchaValidator extends Validator $ca = Yii::$app->createController($this->captchaAction); if ($ca !== false) { /* @var $controller \yii\base\Controller */ - list($controller, $actionID) = $ca; + [$controller, $actionID] = $ca; $action = $controller->createAction($actionID); if ($action !== null) { return $action; diff --git a/framework/console/Application.php b/framework/console/Application.php index cbc581d..df8a873 100644 --- a/framework/console/Application.php +++ b/framework/console/Application.php @@ -142,7 +142,7 @@ class Application extends \yii\base\Application */ public function handleRequest($request) { - list($route, $params) = $request->resolve(); + [$route, $params] = $request->resolve(); $this->requestedRoute = $route; $result = $this->runAction($route, $params); if ($result instanceof Response) { diff --git a/framework/console/UnknownCommandException.php b/framework/console/UnknownCommandException.php index c8ad38c..826a48a 100644 --- a/framework/console/UnknownCommandException.php +++ b/framework/console/UnknownCommandException.php @@ -71,7 +71,7 @@ class UnknownCommandException extends Exception return []; } /** @var $helpController HelpController */ - list($helpController, $actionID) = $help; + [$helpController, $actionID] = $help; $availableActions = []; $commands = $helpController->getCommands(); @@ -85,7 +85,7 @@ class UnknownCommandException extends Exception // add all actions of this controller /** @var $controller Controller */ - list($controller, $actionID) = $result; + [$controller, $actionID] = $result; $actions = $helpController->getActions($controller); if (!empty($actions)) { $prefix = $controller->getUniqueId(); diff --git a/framework/console/controllers/BaseMigrateController.php b/framework/console/controllers/BaseMigrateController.php index 5f79c00..87fa664 100644 --- a/framework/console/controllers/BaseMigrateController.php +++ b/framework/console/controllers/BaseMigrateController.php @@ -578,7 +578,7 @@ abstract class BaseMigrateController extends Controller throw new Exception('The migration name should contain letters, digits, underscore and/or backslash characters only.'); } - list($namespace, $className) = $this->generateClassName($name); + [$namespace, $className] = $this->generateClassName($name); $migrationPath = $this->findMigrationPath($namespace); $file = $migrationPath . DIRECTORY_SEPARATOR . $className . '.php'; diff --git a/framework/console/controllers/HelpController.php b/framework/console/controllers/HelpController.php index ddd2242..8419480 100644 --- a/framework/console/controllers/HelpController.php +++ b/framework/console/controllers/HelpController.php @@ -55,7 +55,7 @@ class HelpController extends Controller throw new Exception("No help for unknown command \"$name\"."); } - list($controller, $actionID) = $result; + [$controller, $actionID] = $result; $actions = $this->getActions($controller); if ($actionID !== '' || count($actions) === 1 && $actions[0] === $controller->defaultAction) { @@ -82,7 +82,7 @@ class HelpController extends Controller continue; } /** @var $controller Controller */ - list($controller, $actionID) = $result; + [$controller, $actionID] = $result; $actions = $this->getActions($controller); if (!empty($actions)) { $prefix = $controller->getUniqueId(); @@ -110,7 +110,7 @@ class HelpController extends Controller } /** @var Controller $controller */ - list($controller, $actionID) = $result; + [$controller, $actionID] = $result; $action = $controller->createAction($actionID); if ($action === null) { return; @@ -145,7 +145,7 @@ class HelpController extends Controller } /** @var Controller $controller */ - list($controller, $actionID) = $result; + [$controller, $actionID] = $result; $action = $controller->createAction($actionID); if ($action === null) { return; @@ -195,7 +195,7 @@ class HelpController extends Controller $result = Yii::$app->createController($command); if ($result !== false && $result[0] instanceof Controller) { - list($controller, $actionID) = $result; + [$controller, $actionID] = $result; /** @var Controller $controller */ $description = $controller->getHelpSummary(); } @@ -294,7 +294,7 @@ class HelpController extends Controller $result = Yii::$app->createController($command); if ($result !== false && $result[0] instanceof Controller) { /** @var $controller Controller */ - list($controller, $actionID) = $result; + [$controller, $actionID] = $result; $actions = $this->getActions($controller); if (!empty($actions)) { $prefix = $controller->getUniqueId(); @@ -320,7 +320,7 @@ class HelpController extends Controller $result = Yii::$app->createController($command); if ($result !== false && $result[0] instanceof Controller) { - list($controller, $actionID) = $result; + [$controller, $actionID] = $result; $actions = $this->getActions($controller); if (!empty($actions)) { $prefix = $controller->getUniqueId(); diff --git a/framework/console/controllers/ServeController.php b/framework/console/controllers/ServeController.php index 65f1513..5609ad9 100644 --- a/framework/console/controllers/ServeController.php +++ b/framework/console/controllers/ServeController.php @@ -113,7 +113,7 @@ class ServeController extends Controller */ protected function isAddressTaken($address) { - list($hostname, $port) = explode(':', $address); + [$hostname, $port] = explode(':', $address); $fp = @fsockopen($hostname, $port, $errno, $errstr, 3); if ($fp === false) { return false; diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php index f5b6735..3d6adc4 100644 --- a/framework/db/ActiveQuery.php +++ b/framework/db/ActiveQuery.php @@ -154,7 +154,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface } if (empty($this->select) && !empty($this->join)) { - list(, $alias) = $this->getTableNameAndAlias(); + $alias = $this->getTableNameAndAlias()[1]; $this->select = ["$alias.*"]; } @@ -172,7 +172,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface } elseif (is_array($this->via)) { // via relation /* @var $viaQuery ActiveQuery */ - list($viaName, $viaQuery) = $this->via; + [$viaName, $viaQuery] = $this->via; if ($viaQuery->multiple) { $viaModels = $viaQuery->all(); $this->primaryModel->populateRelation($viaName, $viaModels); @@ -315,7 +315,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface } if ($this->sql === null) { - list ($sql, $params) = $db->getQueryBuilder()->build($this); + [$sql, $params] = $db->getQueryBuilder()->build($this); } else { $sql = $this->sql; $params = $this->params; @@ -409,7 +409,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface if (preg_match('/^(.*?)(?:\s+AS\s+|\s+)(\w+)$/i', $name, $matches)) { // relation is defined with an alias, adjust callback to apply alias - list(, $relation, $alias) = $matches; + [, $relation, $alias] = $matches; $name = $relation; $callback = function ($query) use ($callback, $alias) { /** @var $query ActiveQuery */ @@ -436,8 +436,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface $this->join = []; $model = new $this->modelClass; - foreach ($this->joinWith as $config) { - list ($with, $eagerLoading, $joinType) = $config; + foreach ($this->joinWith as [$with, $eagerLoading, $joinType]) { $this->joinWithRelations($model, $with, $joinType); if (is_array($eagerLoading)) { @@ -602,8 +601,8 @@ class ActiveQuery extends Query implements ActiveQueryInterface return; } - list ($parentTable, $parentAlias) = $parent->getTableNameAndAlias(); - list ($childTable, $childAlias) = $child->getTableNameAndAlias(); + [$parentTable, $parentAlias] = $parent->getTableNameAndAlias(); + [$childTable, $childAlias] = $child->getTableNameAndAlias(); if (!empty($child->link)) { @@ -777,7 +776,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface public function alias($alias) { if (empty($this->from) || count($this->from) < 2) { - list($tableName, ) = $this->getTableNameAndAlias(); + $tableName = $this->getTableNameAndAlias()[0]; $this->from = [$alias => $tableName]; } else { $tableName = $this->getPrimaryTableName(); diff --git a/framework/db/ActiveRelationTrait.php b/framework/db/ActiveRelationTrait.php index 7ed4d8a..bb76cd7 100644 --- a/framework/db/ActiveRelationTrait.php +++ b/framework/db/ActiveRelationTrait.php @@ -207,7 +207,7 @@ trait ActiveRelationTrait } elseif (is_array($this->via)) { // via relation /* @var $viaQuery ActiveRelationTrait|ActiveQueryTrait */ - list($viaName, $viaQuery) = $this->via; + [$viaName, $viaQuery] = $this->via; if ($viaQuery->asArray === null) { // inherit asArray from primary query $viaQuery->asArray($this->asArray); diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php index 2a0909d..1333f3c 100644 --- a/framework/db/BaseActiveRecord.php +++ b/framework/db/BaseActiveRecord.php @@ -1251,7 +1251,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface } if (is_array($relation->via)) { /* @var $viaRelation ActiveQuery */ - list($viaName, $viaRelation) = $relation->via; + [$viaName, $viaRelation] = $relation->via; $viaClass = $viaRelation->modelClass; // unset $viaName so that it can be reloaded to reflect the change unset($this->_related[$viaName]); @@ -1341,7 +1341,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface if ($relation->via !== null) { if (is_array($relation->via)) { /* @var $viaRelation ActiveQuery */ - list($viaName, $viaRelation) = $relation->via; + [$viaName, $viaRelation] = $relation->via; $viaClass = $viaRelation->modelClass; unset($this->_related[$viaName]); } else { @@ -1436,7 +1436,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface if ($relation->via !== null) { if (is_array($relation->via)) { /* @var $viaRelation ActiveQuery */ - list($viaName, $viaRelation) = $relation->via; + [$viaName, $viaRelation] = $relation->via; $viaClass = $viaRelation->modelClass; unset($this->_related[$viaName]); } else { diff --git a/framework/db/Query.php b/framework/db/Query.php index 89b4d22..7d64065 100644 --- a/framework/db/Query.php +++ b/framework/db/Query.php @@ -123,7 +123,7 @@ class Query extends Component implements QueryInterface if ($db === null) { $db = Yii::$app->getDb(); } - list ($sql, $params) = $db->getQueryBuilder()->build($this); + [$sql, $params] = $db->getQueryBuilder()->build($this); return $db->createCommand($sql, $params); } diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php index 4be6f82..cc25cf5 100644 --- a/framework/db/QueryBuilder.php +++ b/framework/db/QueryBuilder.php @@ -162,7 +162,7 @@ class QueryBuilder extends \yii\base\Object $placeholders = []; $values = ' DEFAULT VALUES'; if ($columns instanceof \yii\db\Query) { - list($names, $values, $params) = $this->prepareInsertSelectSubQuery($columns, $schema); + [$names, $values, $params] = $this->prepareInsertSelectSubQuery($columns, $schema); } else { foreach ($columns as $name => $value) { $names[] = $schema->quoteColumnName($name); @@ -172,7 +172,7 @@ class QueryBuilder extends \yii\base\Object $params[$n] = $v; } } elseif ($value instanceof \yii\db\Query) { - list($sql, $params) = $this->build($value, $params); + [$sql, $params] = $this->build($value, $params); $placeholders[] = "($sql)"; } else { $phName = self::PARAM_PREFIX . count($params); @@ -204,7 +204,7 @@ class QueryBuilder extends \yii\base\Object throw new InvalidArgumentException('Expected select query object with enumerated (named) parameters'); } - list($values, $params) = $this->build($columns, $params); + [$values, $params] = $this->build($columns, $params); $names = []; $values = ' ' . $values; foreach ($columns->select as $title => $field) { @@ -762,7 +762,7 @@ class QueryBuilder extends \yii\base\Object } $params = array_merge($params, $column->params); } elseif ($column instanceof Query) { - list($sql, $params) = $this->build($column, $params); + [$sql, $params] = $this->build($column, $params); $columns[$i] = "($sql) AS " . $this->db->quoteColumnName($i); } elseif (is_string($i)) { if (strpos($column, '(') === false) { @@ -814,7 +814,7 @@ class QueryBuilder extends \yii\base\Object throw new Exception('A join clause must be specified as an array of join type, join table, and optionally join condition.'); } // 0:join type, 1:join table, 2:on-condition (optional) - list ($joinType, $table) = $join; + [$joinType, $table] = $join; $tables = $this->quoteTableNames((array) $table, $params); $table = reset($tables); $joins[$i] = "$joinType $table"; @@ -840,7 +840,7 @@ class QueryBuilder extends \yii\base\Object { foreach ($tables as $i => $table) { if ($table instanceof Query) { - list($sql, $params) = $this->build($table, $params); + [$sql, $params] = $this->build($table, $params); $tables[$i] = "($sql) " . $this->db->quoteTableName($i); } elseif (is_string($i)) { if (strpos($table, '(') === false) { @@ -1002,7 +1002,7 @@ class QueryBuilder extends \yii\base\Object foreach ($unions as $i => $union) { $query = $union['query']; if ($query instanceof Query) { - list($unions[$i]['query'], $params) = $this->build($query, $params); + [$unions[$i]['query'], $params] = $this->build($query, $params); } $result .= 'UNION ' . ($union['all'] ? 'ALL ' : '') . '( ' . $unions[$i]['query'] . ' ) '; @@ -1176,7 +1176,7 @@ class QueryBuilder extends \yii\base\Object throw new InvalidArgumentException("Operator '$operator' requires three operands."); } - list($column, $value1, $value2) = $operands; + [$column, $value1, $value2] = $operands; if (strpos($column, '(') === false) { $column = $this->db->quoteColumnName($column); @@ -1221,7 +1221,7 @@ class QueryBuilder extends \yii\base\Object throw new Exception("Operator '$operator' requires two operands."); } - list($column, $values) = $operands; + [$column, $values] = $operands; if ($column === []) { // no columns to test against @@ -1288,7 +1288,7 @@ class QueryBuilder extends \yii\base\Object */ protected function buildSubqueryInCondition($operator, $columns, $values, &$params) { - list($sql, $params) = $this->build($values, $params); + [$sql, $params] = $this->build($values, $params); if (is_array($columns)) { foreach ($columns as $i => $col) { if (strpos($col, '(') === false) { @@ -1378,7 +1378,7 @@ class QueryBuilder extends \yii\base\Object $not = !empty($matches[3]); $operator = $matches[2]; - list($column, $values) = $operands; + [$column, $values] = $operands; if (!is_array($values)) { $values = [$values]; @@ -1424,7 +1424,7 @@ class QueryBuilder extends \yii\base\Object public function buildExistsCondition($operator, $operands, &$params) { if ($operands[0] instanceof Query) { - list($sql, $params) = $this->build($operands[0], $params); + [$sql, $params] = $this->build($operands[0], $params); return "$operator ($sql)"; } else { throw new InvalidArgumentException('Subquery for EXISTS operator must be a Query object.'); @@ -1445,7 +1445,7 @@ class QueryBuilder extends \yii\base\Object throw new InvalidArgumentException("Operator '$operator' requires two operands."); } - list($column, $value) = $operands; + [$column, $value] = $operands; if (strpos($column, '(') === false) { $column = $this->db->quoteColumnName($column); @@ -1459,7 +1459,7 @@ class QueryBuilder extends \yii\base\Object } return "$column $operator {$value->expression}"; } elseif ($value instanceof Query) { - list($sql, $params) = $this->build($value, $params); + [$sql, $params] = $this->build($value, $params); return "$column $operator ($sql)"; } else { $phName = self::PARAM_PREFIX . count($params); diff --git a/framework/db/mysql/QueryBuilder.php b/framework/db/mysql/QueryBuilder.php index e5c8f30..7db2995 100644 --- a/framework/db/mysql/QueryBuilder.php +++ b/framework/db/mysql/QueryBuilder.php @@ -216,7 +216,7 @@ class QueryBuilder extends \yii\db\QueryBuilder $placeholders = []; $values = ' DEFAULT VALUES'; if ($columns instanceof \yii\db\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); @@ -226,7 +226,7 @@ class QueryBuilder extends \yii\db\QueryBuilder $params[$n] = $v; } } elseif ($value instanceof \yii\db\Query) { - list($sql, $params) = $this->build($value, $params); + [$sql, $params] = $this->build($value, $params); $placeholders[] = "($sql)"; } else { $phName = self::PARAM_PREFIX . count($params); diff --git a/framework/db/oci/QueryBuilder.php b/framework/db/oci/QueryBuilder.php index 608ab9e..4e33e59 100644 --- a/framework/db/oci/QueryBuilder.php +++ b/framework/db/oci/QueryBuilder.php @@ -195,7 +195,7 @@ EOD; $placeholders = []; $values = ' DEFAULT VALUES'; if ($columns instanceof \yii\db\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); @@ -205,7 +205,7 @@ EOD; $params[$n] = $v; } } elseif ($value instanceof \yii\db\Query) { - list($sql, $params) = $this->build($value, $params); + [$sql, $params] = $this->build($value, $params); $placeholders[] = "($sql)"; } else { $phName = self::PARAM_PREFIX . count($params); diff --git a/framework/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php index 807f758..35cc189 100644 --- a/framework/db/sqlite/QueryBuilder.php +++ b/framework/db/sqlite/QueryBuilder.php @@ -448,7 +448,7 @@ class QueryBuilder extends \yii\db\QueryBuilder foreach ($unions as $i => $union) { $query = $union['query']; if ($query instanceof Query) { - list($unions[$i]['query'], $params) = $this->build($query, $params); + [$unions[$i]['query'], $params] = $this->build($query, $params); } $result .= ' UNION ' . ($union['all'] ? 'ALL ' : '') . ' ' . $unions[$i]['query']; diff --git a/framework/di/Container.php b/framework/di/Container.php index 8885c51..af37f77 100644 --- a/framework/di/Container.php +++ b/framework/di/Container.php @@ -362,7 +362,7 @@ class Container extends Component protected function build($class, $params, $config) { /* @var $reflection ReflectionClass */ - list($reflection, $dependencies) = $this->getDependencies($class); + [$reflection, $dependencies] = $this->getDependencies($class); foreach ($params as $index => $param) { $dependencies[$index] = $param; diff --git a/framework/filters/RateLimiter.php b/framework/filters/RateLimiter.php index 7dc9ab6..c75f7a8 100644 --- a/framework/filters/RateLimiter.php +++ b/framework/filters/RateLimiter.php @@ -108,8 +108,8 @@ class RateLimiter extends ActionFilter { $current = time(); - list ($limit, $window) = $user->getRateLimit($request, $action); - list ($allowance, $timestamp) = $user->loadAllowance($request, $action); + [$limit, $window] = $user->getRateLimit($request, $action); + [$allowance, $timestamp] = $user->loadAllowance($request, $action); $allowance += (int) (($current - $timestamp) * $limit / $window); if ($allowance > $limit) { diff --git a/framework/helpers/BaseArrayHelper.php b/framework/helpers/BaseArrayHelper.php index a0666e8..171b3e5 100644 --- a/framework/helpers/BaseArrayHelper.php +++ b/framework/helpers/BaseArrayHelper.php @@ -873,8 +873,7 @@ class BaseArrayHelper $result[$globalKey][$localKey] = $array[$globalKey][$localKey]; } - foreach ($forbiddenVars as $var) { - list($globalKey, $localKey) = $var; + foreach ($forbiddenVars as [$globalKey, $localKey]) { if (array_key_exists($globalKey, $result)) { unset($result[$globalKey][$localKey]); } diff --git a/framework/helpers/BaseConsole.php b/framework/helpers/BaseConsole.php index b42678e..e81ca13 100644 --- a/framework/helpers/BaseConsole.php +++ b/framework/helpers/BaseConsole.php @@ -596,7 +596,7 @@ class BaseConsole } /** - * Usage: list($width, $height) = ConsoleHelper::getScreenSize(); + * Usage: [$width, $height] = ConsoleHelper::getScreenSize(); * * @param bool $refresh whether to force checking and not re-use cached size value. * This is useful to detect changing window size while the application is running but may diff --git a/framework/i18n/Formatter.php b/framework/i18n/Formatter.php index de3391d..8ae1b23 100644 --- a/framework/i18n/Formatter.php +++ b/framework/i18n/Formatter.php @@ -602,7 +602,7 @@ class Formatter extends Component $timeZone = $this->timeZone; // avoid time zone conversion for date-only and time-only values if ($type === 'date' || $type === 'time') { - list($timestamp, $hasTimeInfo, $hasDateInfo) = $this->normalizeDatetimeValue($value, true); + [$timestamp, $hasTimeInfo, $hasDateInfo] = $this->normalizeDatetimeValue($value, true); if ($type === 'date' && !$hasTimeInfo || $type === 'time' && !$hasDateInfo) { $timeZone = $this->defaultTimeZone; } @@ -1188,7 +1188,7 @@ class Formatter extends Component return $this->nullDisplay; } - list($params, $position) = $this->formatSizeNumber($value, $decimals, $options, $textOptions); + [$params, $position] = $this->formatSizeNumber($value, $decimals, $options, $textOptions); if ($this->sizeFormatBase == 1024) { switch ($position) { @@ -1244,7 +1244,7 @@ class Formatter extends Component return $this->nullDisplay; } - list($params, $position) = $this->formatSizeNumber($value, $decimals, $options, $textOptions); + [$params, $position] = $this->formatSizeNumber($value, $decimals, $options, $textOptions); if ($this->sizeFormatBase == 1024) { switch ($position) { diff --git a/framework/log/DbTarget.php b/framework/log/DbTarget.php index 0a844c9..7f1f2c7 100644 --- a/framework/log/DbTarget.php +++ b/framework/log/DbTarget.php @@ -71,7 +71,7 @@ class DbTarget extends Target VALUES (:level, :category, :log_time, :prefix, :message)"; $command = $this->db->createCommand($sql); foreach ($this->messages as $message) { - list($text, $level, $category, $timestamp) = $message; + [$text, $level, $category, $timestamp] = $message; if (!is_string($text)) { // exceptions may not be serializable if in the call stack somewhere is a Closure if ($text instanceof \Throwable || $text instanceof \Exception) { diff --git a/framework/log/Logger.php b/framework/log/Logger.php index 4ebe1ba..4324e55 100644 --- a/framework/log/Logger.php +++ b/framework/log/Logger.php @@ -278,8 +278,8 @@ class Logger extends Component $stack = []; foreach ($messages as $i => $log) { - list($token, $level, $category, $timestamp, $traces) = $log; - $memory = isset($log[5]) ? $log[5] : 0; + [$token, $level, $category, $timestamp, $traces] = $log; + $memory = $log[5] ?? 0; $log[6] = $i; $hash = md5(serialize($token)); if ($level == Logger::LEVEL_PROFILE_BEGIN) { @@ -294,7 +294,7 @@ class Logger extends Component 'level' => count($stack) - 1, 'duration' => $timestamp - $stack[$hash][3], 'memory' => $memory, - 'memoryDiff' => $memory - (isset($stack[$hash][5]) ? $stack[$hash][5] : 0), + 'memoryDiff' => $memory - ($stack[$hash][5] ?? 0), ]; unset($stack[$hash]); } diff --git a/framework/log/SyslogTarget.php b/framework/log/SyslogTarget.php index 2c817b7..c01bb38 100644 --- a/framework/log/SyslogTarget.php +++ b/framework/log/SyslogTarget.php @@ -76,7 +76,7 @@ class SyslogTarget extends Target */ public function formatMessage($message) { - list($text, $level, $category, $timestamp) = $message; + [$text, $level, $category, $timestamp] = $message; $level = Logger::getLevelName($level); if (!is_string($text)) { // exceptions may not be serializable if in the call stack somewhere is a Closure diff --git a/framework/log/Target.php b/framework/log/Target.php index 9133961..7e7a43b 100644 --- a/framework/log/Target.php +++ b/framework/log/Target.php @@ -252,7 +252,7 @@ abstract class Target extends Component */ public function formatMessage($message) { - list($text, $level, $category, $timestamp) = $message; + [$text, $level, $category, $timestamp] = $message; $level = Logger::getLevelName($level); if (!is_string($text)) { // exceptions may not be serializable if in the call stack somewhere is a Closure diff --git a/framework/mutex/PgsqlMutex.php b/framework/mutex/PgsqlMutex.php index 9200a60..29560e8 100644 --- a/framework/mutex/PgsqlMutex.php +++ b/framework/mutex/PgsqlMutex.php @@ -70,7 +70,7 @@ class PgsqlMutex extends DbMutex if ($timeout !== 0) { throw new InvalidArgumentException('PgsqlMutex does not support timeout.'); } - list($key1, $key2) = $this->getKeysFromName($name); + [$key1, $key2] = $this->getKeysFromName($name); return (bool) $this->db ->createCommand('SELECT pg_try_advisory_lock(:key1, :key2)', [':key1' => $key1, ':key2' => $key2]) ->queryScalar(); @@ -84,7 +84,7 @@ class PgsqlMutex extends DbMutex */ protected function releaseLock($name) { - list($key1, $key2) = $this->getKeysFromName($name); + [$key1, $key2] = $this->getKeysFromName($name); return (bool) $this->db ->createCommand('SELECT pg_advisory_unlock(:key1, :key2)', [':key1' => $key1, ':key2' => $key2]) ->queryScalar(); diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php index e25cf72..33b59e9 100644 --- a/framework/rbac/DbManager.php +++ b/framework/rbac/DbManager.php @@ -974,7 +974,7 @@ class DbManager extends BaseManager $data = $this->cache->get($this->cacheKey); if (is_array($data) && isset($data[0], $data[1], $data[2])) { - list ($this->items, $this->rules, $this->parents) = $data; + [$this->items, $this->rules, $this->parents] = $data; return; } diff --git a/framework/rest/Serializer.php b/framework/rest/Serializer.php index 1602156..94981d7 100644 --- a/framework/rest/Serializer.php +++ b/framework/rest/Serializer.php @@ -255,7 +255,7 @@ class Serializer extends Component if ($this->request->getIsHead()) { return null; } else { - list ($fields, $expand) = $this->getRequestedFields(); + [$fields, $expand] = $this->getRequestedFields(); return $model->toArray($fields, $expand); } } @@ -286,7 +286,7 @@ class Serializer extends Component */ protected function serializeModels(array $models) { - list ($fields, $expand) = $this->getRequestedFields(); + [$fields, $expand] = $this->getRequestedFields(); foreach ($models as $i => $model) { if ($model instanceof Arrayable) { $models[$i] = $model->toArray($fields, $expand); diff --git a/framework/validators/ImageValidator.php b/framework/validators/ImageValidator.php index f9067fa..5fbe844 100644 --- a/framework/validators/ImageValidator.php +++ b/framework/validators/ImageValidator.php @@ -134,7 +134,7 @@ class ImageValidator extends FileValidator return [$this->notImage, ['file' => $image->name]]; } - list($width, $height) = $imageInfo; + [$width, $height] = $imageInfo; if ($width == 0 || $height == 0) { return [$this->notImage, ['file' => $image->name]]; diff --git a/framework/validators/IpValidator.php b/framework/validators/IpValidator.php index bfe84f7..fed6de7 100644 --- a/framework/validators/IpValidator.php +++ b/framework/validators/IpValidator.php @@ -432,7 +432,7 @@ class IpValidator extends Validator } foreach ($this->ranges as $string) { - list($isNegated, $range) = $this->parseNegatedRange($string); + [$isNegated, $range] = $this->parseNegatedRange($string); if ($this->inRange($ip, $cidr, $range)) { return !$isNegated; } @@ -469,11 +469,11 @@ class IpValidator extends Validator { $result = []; foreach ($ranges as $string) { - list($isRangeNegated, $range) = $this->parseNegatedRange($string); + [$isRangeNegated, $range] = $this->parseNegatedRange($string); if (isset($this->networks[$range])) { $replacements = $this->prepareRanges($this->networks[$range]); foreach ($replacements as &$replacement) { - list($isReplacementNegated, $replacement) = $this->parseNegatedRange($replacement); + [$isReplacementNegated, $replacement] = $this->parseNegatedRange($replacement); $result[] = ($isRangeNegated && !$isReplacementNegated ? static::NEGATION_CHAR : '') . $replacement; } } else { diff --git a/framework/validators/Validator.php b/framework/validators/Validator.php index 7a5c7cb..c8c1ffb 100644 --- a/framework/validators/Validator.php +++ b/framework/validators/Validator.php @@ -298,7 +298,7 @@ class Validator extends Component return true; } - list($message, $params) = $result; + [$message, $params] = $result; $params['attribute'] = Yii::t('yii', 'the input value'); if (is_array($value)) { $params['value'] = 'array()'; diff --git a/framework/web/Application.php b/framework/web/Application.php index 5ff02c2..30d57ea 100644 --- a/framework/web/Application.php +++ b/framework/web/Application.php @@ -79,7 +79,7 @@ class Application extends \yii\base\Application { if (empty($this->catchAll)) { try { - list ($route, $params) = $request->resolve(); + [$route, $params] = $request->resolve(); } catch (UrlNormalizerRedirectException $e) { $url = $e->url; if (is_array($url)) { diff --git a/framework/web/AssetBundle.php b/framework/web/AssetBundle.php index 0ad68a7..68b37e9 100644 --- a/framework/web/AssetBundle.php +++ b/framework/web/AssetBundle.php @@ -182,7 +182,7 @@ class AssetBundle extends Object public function publish($am) { if ($this->sourcePath !== null && !isset($this->basePath, $this->baseUrl)) { - list($this->basePath, $this->baseUrl) = $am->publish($this->sourcePath, $this->publishOptions); + [$this->basePath, $this->baseUrl] = $am->publish($this->sourcePath, $this->publishOptions); } if (isset($this->basePath, $this->baseUrl) && ($converter = $am->getConverter()) !== null) { diff --git a/framework/web/AssetConverter.php b/framework/web/AssetConverter.php index 55e67d1..0eeff5e 100644 --- a/framework/web/AssetConverter.php +++ b/framework/web/AssetConverter.php @@ -63,7 +63,7 @@ class AssetConverter extends Component implements AssetConverterInterface if ($pos !== false) { $ext = substr($asset, $pos + 1); if (isset($this->commands[$ext])) { - list ($ext, $command) = $this->commands[$ext]; + [$ext, $command] = $this->commands[$ext]; $result = substr($asset, 0, $pos + 1) . $ext; if ($this->forceConvert || @filemtime("$basePath/$result") < @filemtime("$basePath/$asset")) { $this->runCommand($command, $basePath, $asset, $result); diff --git a/framework/web/MultipartFormDataParser.php b/framework/web/MultipartFormDataParser.php index 6fae328..198bb22 100644 --- a/framework/web/MultipartFormDataParser.php +++ b/framework/web/MultipartFormDataParser.php @@ -141,7 +141,7 @@ class MultipartFormDataParser extends Object implements RequestParserInterface if (empty($bodyPart)) { continue; } - list($headers, $value) = preg_split("/\\R\\R/", $bodyPart, 2); + [$headers, $value] = preg_split("/\\R\\R/", $bodyPart, 2); $headers = $this->parseHeaders($headers); if (!isset($headers['content-disposition']['name'])) { @@ -208,7 +208,7 @@ class MultipartFormDataParser extends Object implements RequestParserInterface continue; } - list($headerName, $headerValue) = explode(':', $headerPart, 2); + [$headerName, $headerValue] = explode(':', $headerPart, 2); $headerName = strtolower(trim($headerName)); $headerValue = trim($headerValue); @@ -221,7 +221,7 @@ class MultipartFormDataParser extends Object implements RequestParserInterface if (strpos($part, '=') === false) { $headers[$headerName][] = $part; } else { - list($name, $value) = explode('=', $part, 2); + [$name, $value] = explode('=', $part, 2); $name = strtolower(trim($name)); $value = trim(trim($value), '"'); $headers[$headerName][$name] = $value; diff --git a/framework/web/Request.php b/framework/web/Request.php index 4e33b53..ee95317 100644 --- a/framework/web/Request.php +++ b/framework/web/Request.php @@ -183,7 +183,7 @@ class Request extends \yii\base\Request { $result = Yii::$app->getUrlManager()->parseRequest($this); if ($result !== false) { - list($route, $params) = $result; + [$route, $params] = $result; if ($this->_queryParams === null) { $_GET = $params + $_GET; // preserve numeric keys } else { @@ -1153,7 +1153,7 @@ class Request extends \yii\base\Request ]; foreach ($params as $param) { if (strpos($param, '=') !== false) { - list($key, $value) = explode('=', $param, 2); + [$key, $value] = explode('=', $param, 2); if ($key === 'q') { $values['q'][2] = (double) $value; } else { diff --git a/framework/web/Response.php b/framework/web/Response.php index bc03610..d9452e1 100644 --- a/framework/web/Response.php +++ b/framework/web/Response.php @@ -418,7 +418,7 @@ class Response extends \yii\base\Response $chunkSize = 8 * 1024 * 1024; // 8MB per chunk if (is_array($this->stream)) { - list ($handle, $begin, $end) = $this->stream; + [$handle, $begin, $end] = $this->stream; fseek($handle, $begin); while (!feof($handle) && ($pos = ftell($handle)) <= $end) { if ($pos + $chunkSize > $end) { @@ -516,7 +516,7 @@ class Response extends \yii\base\Response throw new RangeNotSatisfiableHttpException(); } - list($begin, $end) = $range; + [$begin, $end] = $range; if ($begin != 0 || $end != $contentLength - 1) { $this->setStatusCode(206); $headers->set('Content-Range', "bytes $begin-$end/$contentLength"); @@ -571,7 +571,7 @@ class Response extends \yii\base\Response throw new RangeNotSatisfiableHttpException(); } - list($begin, $end) = $range; + [$begin, $end] = $range; if ($begin != 0 || $end != $fileSize - 1) { $this->setStatusCode(206); $headers->set('Content-Range', "bytes $begin-$end/$fileSize"); diff --git a/framework/web/User.php b/framework/web/User.php index 62b0f9d..dc25fed 100644 --- a/framework/web/User.php +++ b/framework/web/User.php @@ -558,7 +558,7 @@ class User extends Component } $data = json_decode($value, true); if (count($data) == 3) { - list ($id, $authKey, $duration) = $data; + [$id, $authKey, $duration] = $data; /* @var $class IdentityInterface */ $class = $this->identityClass; $identity = $class::findIdentity($id); diff --git a/framework/widgets/LinkPager.php b/framework/widgets/LinkPager.php index f83521b..7aa6fbf 100644 --- a/framework/widgets/LinkPager.php +++ b/framework/widgets/LinkPager.php @@ -194,7 +194,7 @@ class LinkPager extends Widget } // internal pages - list($beginPage, $endPage) = $this->getPageRange(); + [$beginPage, $endPage] = $this->getPageRange(); for ($i = $beginPage; $i <= $endPage; ++$i) { $buttons[] = $this->renderPageButton($i + 1, $i, null, $this->disableCurrentPageButton && $i == $currentPage, $i == $currentPage); } diff --git a/tests/framework/console/ControllerTest.php b/tests/framework/console/ControllerTest.php index cc6a698..74cd5cf 100644 --- a/tests/framework/console/ControllerTest.php +++ b/tests/framework/console/ControllerTest.php @@ -32,12 +32,12 @@ class ControllerTest extends TestCase $controller = new FakeController('fake', Yii::$app); $params = ['from params']; - list($fromParam, $other) = $controller->run('aksi1', $params); + [$fromParam, $other] = $controller->run('aksi1', $params); $this->assertEquals('from params', $fromParam); $this->assertEquals('default', $other); $params = ['from params', 'notdefault']; - list($fromParam, $other) = $controller->run('aksi1', $params); + [$fromParam, $other] = $controller->run('aksi1', $params); $this->assertEquals('from params', $fromParam); $this->assertEquals('notdefault', $other); @@ -54,7 +54,7 @@ class ControllerTest extends TestCase $this->assertEquals('testAlias', $result); $params = ['_aliases' => ['ta' => 'from params,notdefault']]; - list($fromParam, $other) = $controller->runAction('aksi6', $params); + [$fromParam, $other] = $controller->runAction('aksi6', $params); $this->assertEquals('from params', $fromParam); $this->assertEquals('notdefault', $other); diff --git a/tests/framework/console/RequestTest.php b/tests/framework/console/RequestTest.php index a2c31ec..2c58a8f 100644 --- a/tests/framework/console/RequestTest.php +++ b/tests/framework/console/RequestTest.php @@ -147,7 +147,7 @@ class RequestTest extends TestCase $request = new Request(); $request->setParams($params); - list($route, $params) = $request->resolve(); + [$route, $params] = $request->resolve(); $this->assertEquals($expected['route'], $route); $this->assertEquals($expected['params'], $params); } diff --git a/tests/framework/db/DatabaseTestCase.php b/tests/framework/db/DatabaseTestCase.php index 7d6de14..e0c29c8 100644 --- a/tests/framework/db/DatabaseTestCase.php +++ b/tests/framework/db/DatabaseTestCase.php @@ -84,8 +84,8 @@ abstract class DatabaseTestCase extends TestCase $db->open(); if ($fixture !== null) { if ($this->driverName === 'oci') { - list($drops, $creates) = explode('/* STATEMENTS */', file_get_contents($fixture), 2); - list($statements, $triggers, $data) = explode('/* TRIGGERS */', $creates, 3); + [$drops, $creates] = explode('/* STATEMENTS */', file_get_contents($fixture), 2); + [$statements, $triggers, $data] = explode('/* TRIGGERS */', $creates, 3); $lines = array_merge(explode('--', $drops), explode(';', $statements), explode('/', $triggers), explode(';', $data)); } else { $lines = explode(';', file_get_contents($fixture)); diff --git a/tests/framework/db/QueryBuilderTest.php b/tests/framework/db/QueryBuilderTest.php index 34d6b06..f78e6fe 100644 --- a/tests/framework/db/QueryBuilderTest.php +++ b/tests/framework/db/QueryBuilderTest.php @@ -1007,8 +1007,8 @@ abstract class QueryBuilderTest extends DatabaseTestCase $qb = $this->getQueryBuilder(); foreach ($this->columnTypes() as $item) { - list ($column, $builder, $expected) = $item; - $expectedColumnSchemaBuilder = isset($item[3]) ? $item[3] : $column; + [$column, $builder, $expected] = $item; + $expectedColumnSchemaBuilder = $item[3] ?? $column; $this->assertEquals($expected, $qb->getColumnType($column)); $this->assertEquals($expected, $qb->getColumnType($builder)); @@ -1024,8 +1024,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase } $columns = []; $i = 0; - foreach ($this->columnTypes() as $item) { - list ($column, $builder, $expected) = $item; + foreach ($this->columnTypes() as [$column, $builder, $expected]) { if (!(strncmp($column, Schema::TYPE_PK, 2) === 0 || strncmp($column, Schema::TYPE_UPK, 3) === 0 || strncmp($column, Schema::TYPE_BIGPK, 5) === 0 || @@ -1206,7 +1205,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase public function testBuildCondition($condition, $expected, $expectedParams) { $query = (new Query())->where($condition); - list($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $this->assertEquals('SELECT *' . (empty($expected) ? '' : ' WHERE ' . $this->replaceQuotes($expected)), $sql); $this->assertEquals($expectedParams, $params); } @@ -1217,7 +1216,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase public function testBuildFilterCondition($condition, $expected, $expectedParams) { $query = (new Query())->filterWhere($condition); - list($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $this->assertEquals('SELECT *' . (empty($expected) ? '' : ' WHERE ' . $this->replaceQuotes($expected)), $sql); $this->assertEquals($expectedParams, $params); } @@ -1276,7 +1275,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->from('TotalExample t') ->where([$cond, $subQuery]); - list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query); + [$actualQuerySql, $actualQueryParams] = $this->getQueryBuilder()->build($query); $this->assertEquals($expectedQuerySql, $actualQuerySql); $this->assertEquals($expectedQueryParams, $actualQueryParams); } @@ -1301,7 +1300,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->where(['exists', $subQuery]) ->andWhere('t.some_column = :some_value', [':some_value' => "asd"]); - list($actualQuerySql, $queryParams) = $this->getQueryBuilder()->build($query); + [$actualQuerySql, $queryParams] = $this->getQueryBuilder()->build($query); $this->assertEquals($expectedQuerySql, $actualQuerySql); $this->assertEquals($expectedQueryParams, $queryParams); } @@ -1325,7 +1324,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->where(['exists', $subQuery]) ->andWhere(['t.some_column' => "asd"]); - list($actualQuerySql, $queryParams) = $this->getQueryBuilder()->build($query); + [$actualQuerySql, $queryParams] = $this->getQueryBuilder()->build($query); $this->assertEquals($expectedQuerySql, $actualQuerySql); $this->assertEquals($expectedQueryParams, $queryParams); } @@ -1353,7 +1352,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->where(['and', 'w > 0', 'x < 2']) ->union($secondQuery) ->union($thirdQuery, TRUE); - list($actualQuerySql, $queryParams) = $this->getQueryBuilder()->build($query); + [$actualQuerySql, $queryParams] = $this->getQueryBuilder()->build($query); $this->assertEquals($expectedQuerySql, $actualQuerySql); $this->assertEquals([], $queryParams); } @@ -1368,7 +1367,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->select('*') ->from('accounts') ->addSelect(['operations_count' => $subquery]); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT *, (SELECT COUNT(*) FROM [[operations]] WHERE account_id = accounts.id) AS [[operations_count]] FROM [[accounts]]'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1386,7 +1385,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase new Expression($this->replaceQuotes("case t.Status_Id when 1 then 'Acknowledge' when 2 then 'No Action' else 'Unknown Action' END as [[Next Action]]")), ]) ->from('tablename'); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes( 'SELECT [[t]].[[id]] AS [[ID]], [[gsm]].[[username]] AS [[GSM]], [[part]].[[Part]], [[t]].[[Part_Cost]] AS [[Part Cost]], st_x(location::geometry) as lon,' . ' case t.Status_Id when 1 then \'Acknowledge\' when 2 then \'No Action\' else \'Unknown Action\' END as [[Next Action]] FROM [[tablename]]'); @@ -1399,7 +1398,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase $query = (new Query()) ->select(new Expression("1 AS ab")) ->from('tablename'); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes("SELECT 1 AS ab FROM [[tablename]]"); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1409,7 +1408,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->addSelect(new Expression("2 AS cd")) ->addSelect(['ef' => new Expression("3")]) ->from('tablename'); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes("SELECT 1 AS ab, 2 AS cd, 3 AS [[ef]] FROM [[tablename]]"); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1417,7 +1416,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase $query = (new Query()) ->select(new Expression("SUBSTR(name, 0, :len)", [':len' => 4])) ->from('tablename'); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes("SELECT SUBSTR(name, 0, :len) FROM [[tablename]]"); $this->assertEquals($expected, $sql); $this->assertEquals([':len' => 4], $params); @@ -1430,7 +1429,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase public function testFromIndexHint() { $query = (new Query)->from([new Expression('{{%user}} USE INDEX (primary)')]); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM {{%user}} USE INDEX (primary)'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1438,7 +1437,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase $query = (new Query) ->from([new Expression('{{user}} {{t}} FORCE INDEX (primary) IGNORE INDEX FOR ORDER BY (i1)')]) ->leftJoin(['p' => 'profile'], 'user.id = profile.user_id USE INDEX (i2)'); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM {{user}} {{t}} FORCE INDEX (primary) IGNORE INDEX FOR ORDER BY (i1) LEFT JOIN [[profile]] [[p]] ON user.id = profile.user_id USE INDEX (i2)'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1450,7 +1449,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase $subquery = (new Query)->from('user')->where('account_id = accounts.id'); $query = (new Query)->from(['activeusers' => $subquery]); // SELECT * FROM (SELECT * FROM [[user]] WHERE [[active]] = 1) [[activeusers]]; - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM (SELECT * FROM [[user]] WHERE account_id = accounts.id) [[activeusers]]'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1459,7 +1458,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase $subquery = (new Query)->from('user')->where('account_id = :id', ['id' => 1]); $query = (new Query)->from(['activeusers' => $subquery])->where('abc = :abc', ['abc' => 'abc']); // SELECT * FROM (SELECT * FROM [[user]] WHERE [[active]] = 1) [[activeusers]]; - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM (SELECT * FROM [[user]] WHERE account_id = :id) [[activeusers]] WHERE abc = :abc'); $this->assertEquals($expected, $sql); $this->assertEquals([ @@ -1471,7 +1470,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase $subquery = "(SELECT * FROM user WHERE account_id = accounts.id)"; $query = (new Query)->from(['activeusers' => $subquery]); // SELECT * FROM (SELECT * FROM [[user]] WHERE [[active]] = 1) [[activeusers]]; - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM (SELECT * FROM user WHERE account_id = accounts.id) [[activeusers]]'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1484,7 +1483,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->select('*') ->from('operations') ->orderBy('name ASC, date DESC'); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM [[operations]] ORDER BY [[name]], [[date]] DESC'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1494,7 +1493,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->select('*') ->from('operations') ->orderBy(['name' => SORT_ASC, 'date' => SORT_DESC]); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM [[operations]] ORDER BY [[name]], [[date]] DESC'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1505,7 +1504,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->from('operations') ->where('account_id = accounts.id') ->orderBy(new Expression('SUBSTR(name, 3, 4) DESC, x ASC')); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM [[operations]] WHERE account_id = accounts.id ORDER BY SUBSTR(name, 3, 4) DESC, x ASC'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1515,7 +1514,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->select('*') ->from('operations') ->orderBy(new Expression('SUBSTR(name, 3, :to) DESC, x ASC', [':to' => 4])); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM [[operations]] ORDER BY SUBSTR(name, 3, :to) DESC, x ASC'); $this->assertEquals($expected, $sql); $this->assertEquals([':to' => 4], $params); @@ -1528,7 +1527,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->select('*') ->from('operations') ->groupBy('name, date'); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM [[operations]] GROUP BY [[name]], [[date]]'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1538,7 +1537,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->select('*') ->from('operations') ->groupBy(['name', 'date']); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM [[operations]] GROUP BY [[name]], [[date]]'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1549,7 +1548,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->from('operations') ->where('account_id = accounts.id') ->groupBy(new Expression('SUBSTR(name, 0, 1), x')); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM [[operations]] WHERE account_id = accounts.id GROUP BY SUBSTR(name, 0, 1), x'); $this->assertEquals($expected, $sql); $this->assertEmpty($params); @@ -1559,7 +1558,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase ->select('*') ->from('operations') ->groupBy(new Expression('SUBSTR(name, 0, :to), x', [':to' => 4])); - list ($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $expected = $this->replaceQuotes('SELECT * FROM [[operations]] GROUP BY SUBSTR(name, 0, :to), x'); $this->assertEquals($expected, $sql); $this->assertEquals([':to' => 4], $params); @@ -1719,7 +1718,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase public function testBuildLikeCondition($condition, $expected, $expectedParams) { $query = (new Query())->where($condition); - list($sql, $params) = $this->getQueryBuilder()->build($query); + [$sql, $params] = $this->getQueryBuilder()->build($query); $this->assertEquals('SELECT *' . (empty($expected) ? '' : ' WHERE ' . $this->replaceQuotes($expected)), $sql); $this->assertEquals($expectedParams, $params); } diff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php index aa3484d..ba128b4 100644 --- a/tests/framework/db/mssql/QueryBuilderTest.php +++ b/tests/framework/db/mssql/QueryBuilderTest.php @@ -28,7 +28,7 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest $query = new Query(); $query->select('id')->from('example')->limit(10)->offset(5); - list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query); + [$actualQuerySql, $actualQueryParams] = $this->getQueryBuilder()->build($query); $this->assertEquals($expectedQuerySql, $actualQuerySql); $this->assertEquals($expectedQueryParams, $actualQueryParams); @@ -42,7 +42,7 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest $query = new Query(); $query->select('id')->from('example')->limit(10); - list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query); + [$actualQuerySql, $actualQueryParams] = $this->getQueryBuilder()->build($query); $this->assertEquals($expectedQuerySql, $actualQuerySql); $this->assertEquals($expectedQueryParams, $actualQueryParams); @@ -56,7 +56,7 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest $query = new Query(); $query->select('id')->from('example')->offset(10); - list($actualQuerySql, $actualQueryParams) = $this->getQueryBuilder()->build($query); + [$actualQuerySql, $actualQueryParams] = $this->getQueryBuilder()->build($query); $this->assertEquals($expectedQuerySql, $actualQuerySql); $this->assertEquals($expectedQueryParams, $actualQueryParams); diff --git a/tests/framework/db/mysql/connection/DeadLockTest.php b/tests/framework/db/mysql/connection/DeadLockTest.php index 2caf747..6f5bbf2 100644 --- a/tests/framework/db/mysql/connection/DeadLockTest.php +++ b/tests/framework/db/mysql/connection/DeadLockTest.php @@ -185,7 +185,7 @@ class DeadLockTest extends \yiiunit\framework\db\mysql\ConnectionTest }); }, Transaction::REPEATABLE_READ); } catch (Exception $e) { - list ($sqlError, $driverError, $driverMessage) = $e->errorInfo; + [$sqlError, $driverError, $driverMessage] = $e->errorInfo; // Deadlock found when trying to get lock; try restarting transaction if ('40001' === $sqlError && 1213 === $driverError) { return self::CHILD_EXIT_CODE_DEADLOCK; @@ -245,7 +245,7 @@ class DeadLockTest extends \yiiunit\framework\db\mysql\ConnectionTest }); }, Transaction::REPEATABLE_READ); } catch (Exception $e) { - list ($sqlError, $driverError, $driverMessage) = $e->errorInfo; + [$sqlError, $driverError, $driverMessage] = $e->errorInfo; // Deadlock found when trying to get lock; try restarting transaction if ('40001' === $sqlError && 1213 === $driverError) { return self::CHILD_EXIT_CODE_DEADLOCK; diff --git a/tests/framework/db/sqlite/ConnectionTest.php b/tests/framework/db/sqlite/ConnectionTest.php index 0ed010c..87a1613 100644 --- a/tests/framework/db/sqlite/ConnectionTest.php +++ b/tests/framework/db/sqlite/ConnectionTest.php @@ -46,9 +46,7 @@ class ConnectionTest extends \yiiunit\framework\db\ConnectionTest { $counts = [[0, 2], [1, 2], [2, 2]]; - foreach ($counts as $count) { - list($masterCount, $slaveCount) = $count; - + foreach ($counts as [$masterCount, $slaveCount]) { $db = $this->prepareMasterSlave($masterCount, $slaveCount); $this->assertInstanceOf(Connection::class, $db->getSlave()); diff --git a/tests/framework/db/sqlite/QueryBuilderTest.php b/tests/framework/db/sqlite/QueryBuilderTest.php index 28446b8..219b102 100644 --- a/tests/framework/db/sqlite/QueryBuilderTest.php +++ b/tests/framework/db/sqlite/QueryBuilderTest.php @@ -106,7 +106,7 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest ->where(['and', 'w > 0', 'x < 2']) ->union($secondQuery) ->union($thirdQuery, TRUE); - list($actualQuerySql, $queryParams) = $this->getQueryBuilder()->build($query); + [$actualQuerySql, $queryParams] = $this->getQueryBuilder()->build($query); $this->assertEquals($expectedQuerySql, $actualQuerySql); $this->assertEquals([], $queryParams); } diff --git a/tests/framework/di/ContainerTest.php b/tests/framework/di/ContainerTest.php index bf26d51..18a5aa7 100644 --- a/tests/framework/di/ContainerTest.php +++ b/tests/framework/di/ContainerTest.php @@ -175,7 +175,7 @@ class ContainerTest extends TestCase $myFunc = function (\yii\console\Request $request, \yii\console\Response $response) { return [$request, $response]; }; - list($request, $response) = Yii::$container->invoke($myFunc); + [$request, $response] = Yii::$container->invoke($myFunc); $this->assertEquals($request, Yii::$app->request); $this->assertEquals($response, Yii::$app->response); } diff --git a/tests/framework/log/SyslogTargetTest.php b/tests/framework/log/SyslogTargetTest.php index 29c83f0..c23ba33 100644 --- a/tests/framework/log/SyslogTargetTest.php +++ b/tests/framework/log/SyslogTargetTest.php @@ -125,13 +125,13 @@ namespace yiiunit\framework\log { static::$functions['openlog'] = function ($arguments) use ($syslogTarget) { $this->assertCount(3, $arguments); - list($identity, $option, $facility) = $arguments; + [$identity, $option, $facility] = $arguments; $syslogTarget->openlog($identity, $option, $facility); }; static::$functions['syslog'] = function ($arguments) use ($syslogTarget) { $this->assertCount(2, $arguments); - list($priority, $message) = $arguments; + [$priority, $message] = $arguments; $syslogTarget->syslog($priority, $message); }; diff --git a/tests/framework/rest/UrlRuleTest.php b/tests/framework/rest/UrlRuleTest.php index c78d5b5..954c3f8 100644 --- a/tests/framework/rest/UrlRuleTest.php +++ b/tests/framework/rest/UrlRuleTest.php @@ -24,10 +24,8 @@ class UrlRuleTest extends TestCase public function testInitControllerNamePluralization() { $suites = $this->getTestsForControllerNamePluralization(); - foreach ($suites as $i => $suite) { - list ($name, $tests) = $suite; - foreach ($tests as $j => $test) { - list ($config, $expected) = $test; + foreach ($suites as $i => [$name, $tests]) { + foreach ($tests as $j => [$config, $expected]) { $rule = new UrlRule($config); $this->assertEquals($expected, $rule->controller, "Test#$i-$j: $name"); } @@ -39,14 +37,12 @@ class UrlRuleTest extends TestCase $manager = new UrlManager(['cache' => null]); $request = new Request(['hostInfo' => 'http://en.example.com', 'methodParam' => '_METHOD',]); $suites = $this->getTestsForParseRequest(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new UrlRule($config); foreach ($tests as $j => $test) { - $request->pathInfo = $test[0]; - $route = $test[1]; - $params = isset($test[2]) ? $test[2] : []; - $_POST['_METHOD'] = isset($test[3]) ? $test[3] : 'GET'; + [$request->pathInfo, $route] = $test; + $params = $test[2] ?? []; + $_POST['_METHOD'] = $test[3] ?? 'GET'; $result = $rule->parseRequest($manager, $request); if ($route === false) { $this->assertFalse($result, "Test#$i-$j: $name"); @@ -344,9 +340,7 @@ class UrlRuleTest extends TestCase */ public function testCreateUrl($rule, $tests) { - foreach ($tests as $test) { - list($params, $expected) = $test; - + foreach ($tests as [$params, $expected]) { $this->mockWebApplication(); Yii::$app->set('request', new Request(['hostInfo' => 'http://api.example.com', 'scriptUrl' => '/index.php'])); $route = array_shift($params); diff --git a/tests/framework/web/ControllerTest.php b/tests/framework/web/ControllerTest.php index 5f32b61..132d80f 100644 --- a/tests/framework/web/ControllerTest.php +++ b/tests/framework/web/ControllerTest.php @@ -24,12 +24,12 @@ class ControllerTest extends TestCase $aksi1 = new InlineAction('aksi1', $this->controller, 'actionAksi1'); $params = ['fromGet' => 'from query params', 'q' => 'd426', 'validator' => 'avaliable']; - list($fromGet, $other) = $this->controller->bindActionParams($aksi1, $params); + [$fromGet, $other] = $this->controller->bindActionParams($aksi1, $params); $this->assertEquals('from query params', $fromGet); $this->assertEquals('default', $other); $params = ['fromGet' => 'from query params', 'q' => 'd426', 'other' => 'avaliable']; - list($fromGet, $other) = $this->controller->bindActionParams($aksi1, $params); + [$fromGet, $other] = $this->controller->bindActionParams($aksi1, $params); $this->assertEquals('from query params', $fromGet); $this->assertEquals('avaliable', $other); diff --git a/tests/framework/web/GroupUrlRuleTest.php b/tests/framework/web/GroupUrlRuleTest.php index 414e16a..3424ee0 100644 --- a/tests/framework/web/GroupUrlRuleTest.php +++ b/tests/framework/web/GroupUrlRuleTest.php @@ -23,11 +23,10 @@ class GroupUrlRuleTest extends TestCase { $manager = new UrlManager(['cache' => null]); $suites = $this->getTestsForCreateUrl(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new GroupUrlRule($config); foreach ($tests as $j => $test) { - list ($route, $params, $expected, $status) = $test; + [$route, $params, $expected, $status] = $test; $url = $rule->createUrl($manager, $route, $params); $this->assertEquals($expected, $url, "Test#$i-$j: $name"); $this->assertSame($status, $rule->getCreateUrlStatus(), "Test#$i-$j: $name"); @@ -40,13 +39,11 @@ class GroupUrlRuleTest extends TestCase $manager = new UrlManager(['cache' => null]); $request = new Request(['hostInfo' => 'http://en.example.com']); $suites = $this->getTestsForParseRequest(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new GroupUrlRule($config); foreach ($tests as $j => $test) { - $request->pathInfo = $test[0]; - $route = $test[1]; - $params = isset($test[2]) ? $test[2] : []; + [$request->pathInfo, $route] = $test; + $params = $test[2] ?? []; $result = $rule->parseRequest($manager, $request); if ($route === false) { $this->assertFalse($result, "Test#$i-$j: $name"); diff --git a/tests/framework/web/UrlRuleTest.php b/tests/framework/web/UrlRuleTest.php index 64394ab..8eb8948 100644 --- a/tests/framework/web/UrlRuleTest.php +++ b/tests/framework/web/UrlRuleTest.php @@ -27,11 +27,9 @@ class UrlRuleTest extends TestCase { $manager = new UrlManager(['cache' => null]); $suites = $this->getTestsForCreateUrl(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new UrlRule($config); - foreach ($tests as $j => $test) { - list ($route, $params, $expected) = $test; + foreach ($tests as $j => [$route, $params, $expected]) { $url = $rule->createUrl($manager, $route, $params); $this->assertSame($expected, $url, "Test#$i-$j: $name"); } @@ -46,12 +44,10 @@ class UrlRuleTest extends TestCase ]); $request = new Request(['hostInfo' => 'http://en.example.com']); $suites = $this->getTestsForParseRequest(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new UrlRule($config); foreach ($tests as $j => $test) { - $request->pathInfo = $test[0]; - $expected = $test[1]; + [$request->pathInfo, $expected] = $test; $result = $rule->parseRequest($manager, $request); if ($expected === false) { $this->assertFalse($result, "Test#$i-$j: $name"); @@ -69,12 +65,11 @@ class UrlRuleTest extends TestCase ]); $request = new Request(['hostInfo' => 'http://en.example.com']); $suites = $this->getTestsForParseRequest(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new UrlRule($config); foreach ($tests as $j => $test) { $request->pathInfo = $test[0]; - $expected = isset($test[2]) ? $test[2] : $test[1]; + $expected = $test[2] ?? $test[1]; try { $result = $rule->parseRequest($manager, $request); if ($expected === false) { @@ -100,12 +95,11 @@ class UrlRuleTest extends TestCase ]); $request = new Request(['hostInfo' => 'http://en.example.com']); $suites = $this->getTestsForParseRequest(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new UrlRule($config); foreach ($tests as $j => $test) { $request->pathInfo = $test[0]; - $expected = isset($test[2]) ? $test[2] : $test[1]; + $expected = $test[2] ?? $test[1]; try { $result = $rule->parseRequest($manager, $request); if ($expected === false) { @@ -129,12 +123,11 @@ class UrlRuleTest extends TestCase ]); $request = new Request(['hostInfo' => 'http://en.example.com']); $suites = $this->getTestsForParseRequest(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new UrlRule($config); foreach ($tests as $j => $test) { $request->pathInfo = $test[0]; - $expected = isset($test[2]) ? $test[2] : $test[1]; + $expected = $test[2] ?? $test[1]; try { $result = $rule->parseRequest($manager, $request); if ($expected === false) { @@ -158,12 +151,10 @@ class UrlRuleTest extends TestCase ]); $request = new Request(['hostInfo' => 'http://en.example.com']); $suites = $this->getTestsForParseRequest(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new UrlRule($config); foreach ($tests as $j => $test) { - $request->pathInfo = $test[0]; - $expected = $test[1]; + [$request->pathInfo, $expected] = $test; try { $result = $rule->parseRequest($manager, $request); if ($expected === false) { @@ -186,12 +177,11 @@ class UrlRuleTest extends TestCase ]); $request = new Request(['hostInfo' => 'http://en.example.com']); $suites = $this->getTestsForParseRequest(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new UrlRule($config); foreach ($tests as $j => $test) { $request->pathInfo = $test[0]; - $expected = isset($test[2]) ? $test[2] : $test[1]; + $expected = $test[2] ?? $test[1]; $result = $rule->parseRequest($manager, $request); if ($expected === false) { $this->assertFalse($result, "Test#$i-$j: $name"); @@ -215,8 +205,7 @@ class UrlRuleTest extends TestCase ]); $request = new Request(['hostInfo' => 'http://en.example.com']); $suites = $this->getTestsForParseRequest(); - foreach ($suites as $i => $suite) { - list ($name, $config, $tests) = $suite; + foreach ($suites as $i => [$name, $config, $tests]) { $rule = new UrlRule($config); foreach ($tests as $j => $test) { $request->pathInfo = $test[0]; @@ -276,8 +265,7 @@ class UrlRuleTest extends TestCase public function testToString() { $suites = $this->getTestsForToString(); - foreach ($suites as $i => $suite) { - list ($name, $config, $test) = $suite; + foreach ($suites as $i => [$name, $config, $test]) { $rule = new UrlRule($config); $this->assertEquals($rule->__toString(), $test, "Test#$i: $name"); }