From 800dad4343f96bb23a0526a72229eace8f72a641 Mon Sep 17 00:00:00 2001 From: eileen Date: Sun, 7 Jun 2020 17:06:38 +1200 Subject: [PATCH] Remove instances of fatal from upgrade folder --- CRM/Upgrade/Form.php | 18 +++++++++--------- CRM/Upgrade/Incremental/php/FourThree.php | 6 +++--- CRM/Upgrade/Page/Upgrade.php | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index e1f7bcd2de..c2788e63ed 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -168,7 +168,7 @@ class CRM_Upgrade_Form extends CRM_Core_Form { if (!isset($errorMessage)) { $errorMessage = 'pre-condition failed for current upgrade step'; } - CRM_Core_Error::fatal($errorMessage); + throw new CRM_Core_Exception($errorMessage); } $this->assign('recentlyViewed', FALSE); } @@ -234,7 +234,7 @@ class CRM_Upgrade_Form extends CRM_Core_Form { if (!isset($errorMessage)) { $errorMessage = 'post-condition failed for current upgrade step'; } - CRM_Core_Error::fatal($errorMessage); + throw new CRM_Core_Exception($errorMessage); } } @@ -385,7 +385,7 @@ SET version = '$version' } else { if (!file_exists($sqlFile)) { - CRM_Core_Error::fatal("sqlfile - $rev.mysql not found."); + throw new CRM_Core_Exception("sqlfile - $rev.mysql not found."); } $this->source($sqlFile); } @@ -400,13 +400,13 @@ SET version = '$version' $latestVer = CRM_Utils_System::version(); $currentVer = CRM_Core_BAO_Domain::version(TRUE); if (!$currentVer) { - CRM_Core_Error::fatal(ts('Version information missing in civicrm database.')); + throw new CRM_Core_Exception(ts('Version information missing in civicrm database.')); } elseif (stripos($currentVer, 'upgrade')) { - CRM_Core_Error::fatal(ts('Database check failed - the database looks to have been partially upgraded. You may want to reload the database with the backup and try the upgrade process again.')); + throw new CRM_Core_Exception(ts('Database check failed - the database looks to have been partially upgraded. You may want to reload the database with the backup and try the upgrade process again.')); } if (!$latestVer) { - CRM_Core_Error::fatal(ts('Version information missing in civicrm codebase.')); + throw new CRM_Core_Exception(ts('Version information missing in civicrm codebase.')); } return [$currentVer, $latestVer]; @@ -510,7 +510,7 @@ SET version = '$version' // Ensure that queue can be created if (!CRM_Queue_BAO_QueueItem::findCreateTable()) { - CRM_Core_Error::fatal(ts('Failed to find or create queueing table')); + throw new CRM_Core_Exception(ts('Failed to find or create queueing table')); } $queue = CRM_Queue_Service::singleton()->create([ 'name' => self::QUEUE_NAME, @@ -707,7 +707,7 @@ SET version = '$version' // pre-db check for major release. if ($upgrade->checkVersionRelease($rev, 'alpha1')) { if (!(is_callable([$versionObject, 'verifyPreDBstate']))) { - CRM_Core_Error::fatal("verifyPreDBstate method was not found for $rev"); + throw new CRM_Core_Exception("verifyPreDBstate method was not found for $rev"); } $error = NULL; @@ -715,7 +715,7 @@ SET version = '$version' if (!isset($error)) { $error = "post-condition failed for current upgrade for $rev"; } - CRM_Core_Error::fatal($error); + throw new CRM_Core_Exception($error); } } diff --git a/CRM/Upgrade/Incremental/php/FourThree.php b/CRM/Upgrade/Incremental/php/FourThree.php index eabdbe968e..4d603e8297 100644 --- a/CRM/Upgrade/Incremental/php/FourThree.php +++ b/CRM/Upgrade/Incremental/php/FourThree.php @@ -39,7 +39,7 @@ class CRM_Upgrade_Incremental_php_FourThree extends CRM_Upgrade_Incremental_Base 1 => $count, 2 => 'SELECT ct.* FROM civicrm_contribution ct LEFT JOIN civicrm_contact c ON ct.contact_id = c.id WHERE c.id IS NULL;', ]); - CRM_Core_Error::fatal($error); + throw new CRM_Core_Exception($error); return FALSE; } } @@ -51,7 +51,7 @@ class CRM_Upgrade_Incremental_php_FourThree extends CRM_Upgrade_Incremental_Base theme('item_list', []); $theme_registry = theme_get_registry(); if (!isset($theme_registry['page']['preprocess functions']) || FALSE === array_search('civicrm_preprocess_page_inject', $theme_registry['page']['preprocess functions'])) { - CRM_Core_Error::fatal('Please reset the Drupal cache (Administer => Site Configuration => Performance => Clear cached data))'); + throw new CRM_Core_Exception('Please reset the Drupal cache (Administer => Site Configuration => Performance => Clear cached data))'); } } } @@ -79,7 +79,7 @@ WHERE {$key}.id IS NULL"; $dao = CRM_Core_DAO::executeQuery($query, [], TRUE, NULL, FALSE, FALSE); if ($dao->N) { $invalidDataMessage = 'Oops, it looks like you have orphaned recurring contribution records in your database. Before this upgrade can complete they will need to be fixed or deleted. You can review steps to correct this situation on the documentation wiki.'; - CRM_Core_Error::fatal($invalidDataMessage); + throw new CRM_Core_Exception($invalidDataMessage); return FALSE; } } diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php index a8008f14b9..77b7ad1103 100644 --- a/CRM/Upgrade/Page/Upgrade.php +++ b/CRM/Upgrade/Page/Upgrade.php @@ -66,7 +66,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { break; default: - CRM_Core_Error::fatal(ts('Unrecognized upgrade action')); + throw new CRM_Core_Exception(ts('Unrecognized upgrade action')); } } @@ -79,7 +79,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); if ($error = $upgrade->checkUpgradeableVersion($currentVer, $latestVer)) { - CRM_Core_Error::fatal($error); + throw new CRM_Core_Exception($error); } $config = CRM_Core_Config::singleton(); @@ -119,7 +119,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); if ($error = $upgrade->checkUpgradeableVersion($currentVer, $latestVer)) { - CRM_Core_Error::fatal($error); + throw new CRM_Core_Exception($error); } $config = CRM_Core_Config::singleton(); @@ -145,7 +145,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { 'buttons' => ['retry' => $config->debug, 'skip' => $config->debug], ]); $queueRunner->runAllViaWeb(); - CRM_Core_Error::fatal(ts('Upgrade failed to redirect')); + throw new CRM_Core_Exception(ts('Upgrade failed to redirect')); } /** @@ -172,7 +172,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(); if ($error = $upgrade->checkCurrentVersion($currentVer, $latestVer)) { - CRM_Core_Error::fatal($error); + throw new CRM_Core_Exception($error); } $template->assign('message', $postUpgradeMessage); -- 2.25.1