From c9b09f7d9acfecfb0193b9f224307d0a2d001914 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 26 Aug 2022 14:46:37 -0700 Subject: [PATCH] (NFC) Civi - Autoformat `list()` statements --- Civi/API/Api3SelectQuery.php | 4 ++-- Civi/API/Kernel.php | 6 +++--- Civi/API/Subscriber/DynamicFKAuthorization.php | 2 +- Civi/Api4/Provider/ActionObjectProvider.php | 2 +- Civi/Api4/Query/Api4SelectQuery.php | 10 +++++----- Civi/Core/SettingsStack.php | 2 +- Civi/Crypto/CryptoRegistry.php | 2 +- Civi/Test/Api3TestTrait.php | 2 +- Civi/Test/HttpTestTrait.php | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Civi/API/Api3SelectQuery.php b/Civi/API/Api3SelectQuery.php index 7411d4909b..3bd6708ffa 100644 --- a/Civi/API/Api3SelectQuery.php +++ b/Civi/API/Api3SelectQuery.php @@ -76,12 +76,12 @@ class Api3SelectQuery extends SelectQuery { // If we check a custom field on 'IS NULL', it should also work when there is no // record in the custom value table, see CRM-20740. $side = empty($value['IS NULL']) ? 'INNER' : 'LEFT OUTER'; - list($table_name, $column_name) = $this->addCustomField($this->apiFieldSpec['custom_' . $cf_id], $side); + [$table_name, $column_name] = $this->addCustomField($this->apiFieldSpec['custom_' . $cf_id], $side); } elseif (strpos($key, '.')) { $fkInfo = $this->addFkField($key, 'INNER'); if ($fkInfo) { - list($table_name, $column_name) = $fkInfo; + [$table_name, $column_name] = $fkInfo; $this->validateNestedInput($key, $value); } } diff --git a/Civi/API/Kernel.php b/Civi/API/Kernel.php index 96cc6120fc..8dae508a79 100644 --- a/Civi/API/Kernel.php +++ b/Civi/API/Kernel.php @@ -120,7 +120,7 @@ class Kernel { try { $this->boot($apiRequest); - list($apiProvider, $apiRequest) = $this->resolve($apiRequest); + [$apiProvider, $apiRequest] = $this->resolve($apiRequest); $this->authorize($apiProvider, $apiRequest); return TRUE; } @@ -143,9 +143,9 @@ class Kernel { public function runRequest($apiRequest) { $this->boot($apiRequest); - list($apiProvider, $apiRequest) = $this->resolve($apiRequest); + [$apiProvider, $apiRequest] = $this->resolve($apiRequest); $this->authorize($apiProvider, $apiRequest); - list ($apiProvider, $apiRequest) = $this->prepare($apiProvider, $apiRequest); + [$apiProvider, $apiRequest] = $this->prepare($apiProvider, $apiRequest); $result = $apiProvider->invoke($apiRequest); return $this->respond($apiProvider, $apiRequest, $result); diff --git a/Civi/API/Subscriber/DynamicFKAuthorization.php b/Civi/API/Subscriber/DynamicFKAuthorization.php index 225a00b402..ec5a50ac13 100644 --- a/Civi/API/Subscriber/DynamicFKAuthorization.php +++ b/Civi/API/Subscriber/DynamicFKAuthorization.php @@ -156,7 +156,7 @@ class DynamicFKAuthorization implements EventSubscriberInterface { } if (isset($apiRequest['params']['id'])) { - list($isValidId, $entityTable, $entityId) = $this->getDelegate($apiRequest['params']['id']); + [$isValidId, $entityTable, $entityId] = $this->getDelegate($apiRequest['params']['id']); if ($isValidId && $entityTable && $entityId) { $this->authorizeDelegate($apiRequest['action'], $entityTable, $entityId, $apiRequest); $this->preventReassignment($apiRequest['params']['id'], $entityTable, $entityId, $apiRequest); diff --git a/Civi/Api4/Provider/ActionObjectProvider.php b/Civi/Api4/Provider/ActionObjectProvider.php index 2b1b845bb1..8bfa560507 100644 --- a/Civi/Api4/Provider/ActionObjectProvider.php +++ b/Civi/Api4/Provider/ActionObjectProvider.php @@ -96,7 +96,7 @@ class ActionObjectProvider implements EventSubscriberInterface, ProviderInterfac * @throws \API_Exception */ protected function runChain($request, $row) { - list($entity, $action, $params, $index) = $request; + [$entity, $action, $params, $index] = $request; // Swap out variables in $entity, $action & $params $this->resolveChainLinks($entity, $row); $this->resolveChainLinks($action, $row); diff --git a/Civi/Api4/Query/Api4SelectQuery.php b/Civi/Api4/Query/Api4SelectQuery.php index 0ccce5e8b8..de08cff0b0 100644 --- a/Civi/Api4/Query/Api4SelectQuery.php +++ b/Civi/Api4/Query/Api4SelectQuery.php @@ -484,9 +484,9 @@ class Api4SelectQuery { } // If either the having or select field contains a pseudoconstant suffix, match and perform substitution else { - list($fieldName) = explode(':', $expr); + [$fieldName] = explode(':', $expr); foreach ($this->selectAliases as $selectAlias => $selectExpr) { - list($selectField) = explode(':', $selectAlias); + [$selectField] = explode(':', $selectAlias); if ($selectAlias === $selectExpr && $fieldName === $selectField && isset($this->apiFieldSpec[$fieldName])) { $field = $this->getField($fieldName); FormattingUtil::formatInputValue($value, $expr, $field, $operator); @@ -712,7 +712,7 @@ class Api4SelectQuery { // First item in the array is the entity name $entity = array_shift($join); // Which might contain an alias. Split on the keyword "AS" - list($entity, $alias) = array_pad(explode(' AS ', $entity), 2, NULL); + [$entity, $alias] = array_pad(explode(' AS ', $entity), 2, NULL); // Ensure permissions if (!$this->checkEntityAccess($entity)) { continue; @@ -785,7 +785,7 @@ class Api4SelectQuery { $stack = [NULL, NULL]; // See if the ON clause already contains an FK reference to joinEntity $explicitFK = array_filter($joinTree, function($clause) use ($alias, $joinEntityFields) { - list($sideA, $op, $sideB) = array_pad((array) $clause, 3, NULL); + [$sideA, $op, $sideB] = array_pad((array) $clause, 3, NULL); if ($op !== '=' || !$sideB) { return FALSE; } @@ -987,7 +987,7 @@ class Api4SelectQuery { $bridgeAlias = $side === 'INNER' ? $bridgeAlias : $alias; // Find explicit bridge join conditions and move them out of the joinTree $joinTree = array_filter($joinTree, function ($clause) use ($baseRef, $alias, $bridgeAlias, &$bridgeConditions) { - list($sideA, $op, $sideB) = array_pad((array) $clause, 3, NULL); + [$sideA, $op, $sideB] = array_pad((array) $clause, 3, NULL); // Skip AND/OR/NOT branches if (!$sideB) { return TRUE; diff --git a/Civi/Core/SettingsStack.php b/Civi/Core/SettingsStack.php index 9183857d5c..5c0e64d301 100644 --- a/Civi/Core/SettingsStack.php +++ b/Civi/Core/SettingsStack.php @@ -43,7 +43,7 @@ class SettingsStack { */ public function popAll() { while ($frame = array_pop($this->stack)) { - list($setting, $value) = $frame; + [$setting, $value] = $frame; if ($value === NULL) { unset($GLOBALS['civicrm_setting']['domain'][$setting]); } diff --git a/Civi/Crypto/CryptoRegistry.php b/Civi/Crypto/CryptoRegistry.php index 5c6fd958da..0ae3d1afd2 100644 --- a/Civi/Crypto/CryptoRegistry.php +++ b/Civi/Crypto/CryptoRegistry.php @@ -287,7 +287,7 @@ class CryptoRegistry { * @throws CryptoException */ public function parseKey($keyExpr) { - list($suite, $keyFunc, $keyVal) = explode(':', $keyExpr); + [$suite, $keyFunc, $keyVal] = explode(':', $keyExpr); if ($suite === '') { $suite = self::DEFAULT_SUITE; } diff --git a/Civi/Test/Api3TestTrait.php b/Civi/Test/Api3TestTrait.php index dafe7e70a6..59eb25c063 100644 --- a/Civi/Test/Api3TestTrait.php +++ b/Civi/Test/Api3TestTrait.php @@ -639,7 +639,7 @@ trait Api3TestTrait { } // Handle single api call - list(, $chainEntity, $chainAction) = explode('.', $key); + [, $chainEntity, $chainAction] = explode('.', $key); $lcChainEntity = \CRM_Core_DAO_AllCoreTables::convertEntityNameToLower($chainEntity); $chainEntity = \CRM_Core_DAO_AllCoreTables::convertEntityNameToCamel($chainEntity); $lcMainEntity = \CRM_Core_DAO_AllCoreTables::convertEntityNameToLower($mainEntity); diff --git a/Civi/Test/HttpTestTrait.php b/Civi/Test/HttpTestTrait.php index 0f6637a58c..e3384ecbec 100644 --- a/Civi/Test/HttpTestTrait.php +++ b/Civi/Test/HttpTestTrait.php @@ -139,7 +139,7 @@ trait HttpTestTrait { */ protected function assertContentType($expectType, $response = NULL) { $response = $this->resolveResponse($response); - list($actualType) = explode(';', $response->getHeader('Content-Type')[0]); + [$actualType] = explode(';', $response->getHeader('Content-Type')[0]); $fmt = $actualType === $expectType ? '' : $this->formatFailure($response); $this->assertEquals($expectType, $actualType, "Expected content-type $expectType. Received content-type $actualType.\n$fmt"); return $this; -- 2.25.1