From ebb54be3069c9394594385ebff2107ff17da16aa Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 26 Aug 2022 14:39:10 -0700 Subject: [PATCH] (NFC) CRM/Upgrade - Autoformat `list()` statements --- CRM/Upgrade/Form.php | 2 +- CRM/Upgrade/Headless.php | 2 +- CRM/Upgrade/Incremental/php/FiveTwenty.php | 2 +- CRM/Upgrade/Incremental/php/FiveTwentyNine.php | 2 +- CRM/Upgrade/Incremental/php/FourSeven.php | 2 +- CRM/Upgrade/Page/Upgrade.php | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index 78c31d7501..1fb14e1aa8 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -787,7 +787,7 @@ SET version = '$version' $restore = \CRM_Upgrade_DispatchPolicy::useTemporarily('upgrade.finish'); $upgrade = new CRM_Upgrade_Form(); - list($ignore, $latestVer) = $upgrade->getUpgradeVersions(); + [$ignore, $latestVer] = $upgrade->getUpgradeVersions(); // Seems extraneous in context, but we'll preserve old behavior $upgrade->setVersion($latestVer); // Going forward, any new tasks will run in `upgrade.finish` mode. diff --git a/CRM/Upgrade/Headless.php b/CRM/Upgrade/Headless.php index 6bd63d32dd..44dca076c9 100644 --- a/CRM/Upgrade/Headless.php +++ b/CRM/Upgrade/Headless.php @@ -28,7 +28,7 @@ class CRM_Upgrade_Headless { set_time_limit(0); $upgrade = new CRM_Upgrade_Form(); - list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); + [$currentVer, $latestVer] = $upgrade->getUpgradeVersions(); if ($error = $upgrade->checkUpgradeableVersion($currentVer, $latestVer)) { throw new Exception($error); diff --git a/CRM/Upgrade/Incremental/php/FiveTwenty.php b/CRM/Upgrade/Incremental/php/FiveTwenty.php index 1edbef463c..c88ec4be86 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwenty.php +++ b/CRM/Upgrade/Incremental/php/FiveTwenty.php @@ -130,7 +130,7 @@ class CRM_Upgrade_Incremental_php_FiveTwenty extends CRM_Upgrade_Incremental_Bas continue; } // parse out existing id and direction - list($relationshipTypeId, $direction1) = explode('_', $match); + [$relationshipTypeId, $direction1] = explode('_', $match); // we only care about ones that are b_a if ($direction1 === 'b') { // we only care about bidirectional diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyNine.php b/CRM/Upgrade/Incremental/php/FiveTwentyNine.php index de6ffb7808..b862968647 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentyNine.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentyNine.php @@ -42,7 +42,7 @@ class CRM_Upgrade_Incremental_php_FiveTwentyNine extends CRM_Upgrade_Incremental $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); $this->addTask('Install eventcart extension', 'installEventCart'); - list($minId, $maxId) = CRM_Core_DAO::executeQuery("SELECT coalesce(min(id),0), coalesce(max(id),0) + [$minId, $maxId] = CRM_Core_DAO::executeQuery("SELECT coalesce(min(id),0), coalesce(max(id),0) FROM civicrm_relationship ")->getDatabaseResult()->fetchRow(); for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) { $endId = $startId + self::BATCH_SIZE - 1; diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index c4affbe683..71f6d29712 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -457,7 +457,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base // CRM-20868 : Update invoice_numbers (in batch) with value in [invoice prefix][contribution id] format $contributionSettings = Civi::settings()->get('contribution_invoice_settings'); if (!empty($contributionSettings['invoicing']) && !empty($contributionSettings['invoice_prefix'])) { - list($minId, $maxId) = CRM_Core_DAO::executeQuery("SELECT coalesce(min(id),0), coalesce(max(id),0) + [$minId, $maxId] = CRM_Core_DAO::executeQuery("SELECT coalesce(min(id),0), coalesce(max(id),0) FROM civicrm_contribution ")->getDatabaseResult()->fetchRow(); for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) { $endId = $startId + self::BATCH_SIZE - 1; diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php index f96874efcd..d1b5e2610b 100644 --- a/CRM/Upgrade/Page/Upgrade.php +++ b/CRM/Upgrade/Page/Upgrade.php @@ -27,7 +27,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { Civi::resources()->addStyleFile('civicrm', 'css/admin.css'); $upgrade = new CRM_Upgrade_Form(); - list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); + [$currentVer, $latestVer] = $upgrade->getUpgradeVersions(); CRM_Utils_System::setTitle(ts('Upgrade CiviCRM to Version %1', [1 => $latestVer] @@ -66,7 +66,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { public function runIntro() { $upgrade = new CRM_Upgrade_Form(); $template = CRM_Core_Smarty::singleton(); - list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); + [$currentVer, $latestVer] = $upgrade->getUpgradeVersions(); CRM_Core_Smarty::singleton()->assign('sid', CRM_Utils_System::getSiteID()); // Show success msg if db already upgraded if (version_compare($currentVer, $latestVer) == 0) { @@ -121,7 +121,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { */ public function runBegin() { $upgrade = new CRM_Upgrade_Form(); - list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); + [$currentVer, $latestVer] = $upgrade->getUpgradeVersions(); if ($error = $upgrade->checkUpgradeableVersion($currentVer, $latestVer)) { throw new CRM_Core_Exception($error); @@ -175,7 +175,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { } // do a version check - after doFinish() sets the final version - list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); + [$currentVer, $latestVer] = $upgrade->getUpgradeVersions(); if ($error = $upgrade->checkCurrentVersion($currentVer, $latestVer)) { throw new CRM_Core_Exception($error); } -- 2.25.1