From 6317d2915badb91af6b2e72fed9f7135faac7642 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 8 Dec 2021 09:49:15 -0500 Subject: [PATCH] NFC - Delete boilerplate comments and empty functions from upgrade classes --- CRM/Upgrade/Incremental/php/FiveEight.php | 59 +----------------- CRM/Upgrade/Incremental/php/FiveEighteen.php | 46 +------------- CRM/Upgrade/Incremental/php/FiveEleven.php | 42 +------------ CRM/Upgrade/Incremental/php/FiveFifteen.php | 42 +------------ CRM/Upgrade/Incremental/php/FiveFive.php | 59 +----------------- CRM/Upgrade/Incremental/php/FiveForty.php | 39 +----------- CRM/Upgrade/Incremental/php/FiveFortyFive.php | 39 +----------- CRM/Upgrade/Incremental/php/FiveFortyFour.php | 39 +----------- CRM/Upgrade/Incremental/php/FiveFortyOne.php | 27 +------- .../Incremental/php/FiveFortyThree.php | 19 ------ CRM/Upgrade/Incremental/php/FiveFortyTwo.php | 45 +------------- CRM/Upgrade/Incremental/php/FiveFour.php | 48 +------------- CRM/Upgrade/Incremental/php/FiveFourteen.php | 45 +------------- CRM/Upgrade/Incremental/php/FiveNine.php | 49 +-------------- CRM/Upgrade/Incremental/php/FiveNineteen.php | 36 +---------- CRM/Upgrade/Incremental/php/FiveOne.php | 59 +----------------- CRM/Upgrade/Incremental/php/FiveSeven.php | 60 +----------------- CRM/Upgrade/Incremental/php/FiveSeventeen.php | 59 +----------------- CRM/Upgrade/Incremental/php/FiveSix.php | 42 +------------ CRM/Upgrade/Incremental/php/FiveSixteen.php | 59 +----------------- CRM/Upgrade/Incremental/php/FiveTen.php | 59 +----------------- CRM/Upgrade/Incremental/php/FiveThirteen.php | 27 +------- CRM/Upgrade/Incremental/php/FiveThirty.php | 59 +----------------- .../Incremental/php/FiveThirtyEight.php | 62 +------------------ .../Incremental/php/FiveThirtyFive.php | 42 +------------ .../Incremental/php/FiveThirtyFour.php | 9 +-- .../Incremental/php/FiveThirtyNine.php | 45 +------------- CRM/Upgrade/Incremental/php/FiveThirtyOne.php | 42 +------------ .../Incremental/php/FiveThirtySeven.php | 40 +----------- CRM/Upgrade/Incremental/php/FiveThirtySix.php | 24 +------ .../Incremental/php/FiveThirtyThree.php | 36 +---------- CRM/Upgrade/Incremental/php/FiveThirtyTwo.php | 33 ---------- CRM/Upgrade/Incremental/php/FiveThree.php | 41 +----------- CRM/Upgrade/Incremental/php/FiveTwelve.php | 42 +------------ CRM/Upgrade/Incremental/php/FiveTwenty.php | 28 +-------- .../Incremental/php/FiveTwentyEight.php | 9 +-- .../Incremental/php/FiveTwentyFive.php | 59 +----------------- .../Incremental/php/FiveTwentyFour.php | 36 +---------- .../Incremental/php/FiveTwentyNine.php | 24 +------ CRM/Upgrade/Incremental/php/FiveTwentyOne.php | 40 +----------- .../Incremental/php/FiveTwentySeven.php | 24 +------ CRM/Upgrade/Incremental/php/FiveTwentySix.php | 9 +-- .../Incremental/php/FiveTwentyThree.php | 37 +---------- CRM/Upgrade/Incremental/php/FiveTwentyTwo.php | 59 +----------------- CRM/Upgrade/Incremental/php/FiveTwo.php | 55 +--------------- CRM/Upgrade/Incremental/php/FiveZero.php | 56 ----------------- CRM/Upgrade/Incremental/php/FourSeven.php | 6 -- 47 files changed, 86 insertions(+), 1830 deletions(-) diff --git a/CRM/Upgrade/Incremental/php/FiveEight.php b/CRM/Upgrade/Incremental/php/FiveEight.php index 343c8784db..4266fc6012 100644 --- a/CRM/Upgrade/Incremental/php/FiveEight.php +++ b/CRM/Upgrade/Incremental/php/FiveEight.php @@ -10,63 +10,8 @@ */ /** - * Upgrade logic for FiveEight */ + * Upgrade logic for FiveEight + */ class CRM_Upgrade_Incremental_php_FiveEight extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveEighteen.php b/CRM/Upgrade/Incremental/php/FiveEighteen.php index 6428be7bec..cef7f0bb26 100644 --- a/CRM/Upgrade/Incremental/php/FiveEighteen.php +++ b/CRM/Upgrade/Incremental/php/FiveEighteen.php @@ -10,48 +10,10 @@ */ /** - * Upgrade logic for FiveEighteen */ + * Upgrade logic for FiveEighteen + */ class CRM_Upgrade_Incremental_php_FiveEighteen extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * @@ -155,8 +117,4 @@ class CRM_Upgrade_Incremental_php_FiveEighteen extends CRM_Upgrade_Incremental_B return TRUE; } - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveEleven.php b/CRM/Upgrade/Incremental/php/FiveEleven.php index 6ad79515b2..4f2f90f5b9 100644 --- a/CRM/Upgrade/Incremental/php/FiveEleven.php +++ b/CRM/Upgrade/Incremental/php/FiveEleven.php @@ -10,48 +10,10 @@ */ /** - * Upgrade logic for FiveEleven */ + * Upgrade logic for FiveEleven + */ class CRM_Upgrade_Incremental_php_FiveEleven extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveFifteen.php b/CRM/Upgrade/Incremental/php/FiveFifteen.php index 7609e510a7..bb3740183a 100644 --- a/CRM/Upgrade/Incremental/php/FiveFifteen.php +++ b/CRM/Upgrade/Incremental/php/FiveFifteen.php @@ -10,48 +10,10 @@ */ /** - * Upgrade logic for FiveFifteen */ + * Upgrade logic for FiveFifteen + */ class CRM_Upgrade_Incremental_php_FiveFifteen extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveFive.php b/CRM/Upgrade/Incremental/php/FiveFive.php index 05027fb8d6..3d2267a8b6 100644 --- a/CRM/Upgrade/Incremental/php/FiveFive.php +++ b/CRM/Upgrade/Incremental/php/FiveFive.php @@ -10,63 +10,8 @@ */ /** - * Upgrade logic for FiveFive */ + * Upgrade logic for FiveFive + */ class CRM_Upgrade_Incremental_php_FiveFive extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveForty.php b/CRM/Upgrade/Incremental/php/FiveForty.php index 0c07adf081..047d87a9a0 100644 --- a/CRM/Upgrade/Incremental/php/FiveForty.php +++ b/CRM/Upgrade/Incremental/php/FiveForty.php @@ -10,45 +10,10 @@ */ /** - * Upgrade logic for FiveForty */ + * Upgrade logic for FiveForty + */ class CRM_Upgrade_Incremental_php_FiveForty extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - public function upgrade_5_40_alpha1($rev) { $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); $this->addTask('Add option list for group_used_for', 'addGroupOptionList'); diff --git a/CRM/Upgrade/Incremental/php/FiveFortyFive.php b/CRM/Upgrade/Incremental/php/FiveFortyFive.php index cb783ee669..01863d045d 100644 --- a/CRM/Upgrade/Incremental/php/FiveFortyFive.php +++ b/CRM/Upgrade/Incremental/php/FiveFortyFive.php @@ -10,45 +10,10 @@ */ /** - * Upgrade logic for FiveFortyFive */ + * Upgrade logic for FiveFortyFive + */ class CRM_Upgrade_Incremental_php_FiveFortyFive extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL): void { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev): void { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveFortyFour.php b/CRM/Upgrade/Incremental/php/FiveFortyFour.php index 54ed66aab5..f8a3617e4f 100644 --- a/CRM/Upgrade/Incremental/php/FiveFortyFour.php +++ b/CRM/Upgrade/Incremental/php/FiveFortyFour.php @@ -10,45 +10,10 @@ */ /** - * Upgrade logic for FiveFortyFour */ + * Upgrade logic for FiveFortyFour + */ class CRM_Upgrade_Incremental_php_FiveFortyFour extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL): void { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev): void { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - /** * Upgrade function. * @param string $rev diff --git a/CRM/Upgrade/Incremental/php/FiveFortyOne.php b/CRM/Upgrade/Incremental/php/FiveFortyOne.php index cab70b9c26..dcf9e4c422 100644 --- a/CRM/Upgrade/Incremental/php/FiveFortyOne.php +++ b/CRM/Upgrade/Incremental/php/FiveFortyOne.php @@ -10,27 +10,10 @@ */ /** - * Upgrade logic for FiveFortyOne */ + * Upgrade logic for FiveFortyOne + */ class CRM_Upgrade_Incremental_php_FiveFortyOne extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - /** * Compute any messages which should be displayed after upgrade. * @@ -48,12 +31,6 @@ class CRM_Upgrade_Incremental_php_FiveFortyOne extends CRM_Upgrade_Incremental_B } } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveFortyThree.php b/CRM/Upgrade/Incremental/php/FiveFortyThree.php index db117ecd73..5262a52fc1 100644 --- a/CRM/Upgrade/Incremental/php/FiveFortyThree.php +++ b/CRM/Upgrade/Incremental/php/FiveFortyThree.php @@ -26,30 +26,11 @@ class CRM_Upgrade_Incremental_php_FiveFortyThree extends CRM_Upgrade_Incremental * @param null $currentVer */ public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL): void { - // Example: Generate a pre-upgrade message. if ($rev === '5.43.alpha1' && !empty(CRM_Core_Component::getEnabledComponents()['CiviCase'])) { $preUpgradeMessage .= '

' . ts('Minor changes have been made to how the tokens to render case.is_deleted, case.created_date and case.modified_date. See https://docs.civicrm.org/sysadmin/en/latest/upgrade/version-specific/ for more') . '

'; } } - /** - * Compute any messages which should be displayed after upgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev): void { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveFortyTwo.php b/CRM/Upgrade/Incremental/php/FiveFortyTwo.php index 265aa328ee..718bef9dba 100644 --- a/CRM/Upgrade/Incremental/php/FiveFortyTwo.php +++ b/CRM/Upgrade/Incremental/php/FiveFortyTwo.php @@ -10,51 +10,10 @@ */ /** - * Upgrade logic for FiveFortyTwo */ + * Upgrade logic for FiveFortyTwo + */ class CRM_Upgrade_Incremental_php_FiveFortyTwo extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveFour.php b/CRM/Upgrade/Incremental/php/FiveFour.php index 634ae0fd7b..b327366a14 100644 --- a/CRM/Upgrade/Incremental/php/FiveFour.php +++ b/CRM/Upgrade/Incremental/php/FiveFour.php @@ -10,27 +10,10 @@ */ /** - * Upgrade logic for FiveFour */ + * Upgrade logic for FiveFour + */ class CRM_Upgrade_Incremental_php_FiveFour extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - /** * Compute any messages which should be displayed after upgrade. * @@ -43,10 +26,6 @@ class CRM_Upgrade_Incremental_php_FiveFour extends CRM_Upgrade_Incremental_Base if ($rev == '5.4.alpha1') { $postUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. It is not granted by default. If your users create reports, you may wish to review their permissions.', [1 => ts('save Report Criteria')]) . '

'; } - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } } /** @@ -98,27 +77,4 @@ class CRM_Upgrade_Incremental_php_FiveFour extends CRM_Upgrade_Incremental_Base return TRUE; } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveFourteen.php b/CRM/Upgrade/Incremental/php/FiveFourteen.php index 49755d6d17..0e0f265322 100644 --- a/CRM/Upgrade/Incremental/php/FiveFourteen.php +++ b/CRM/Upgrade/Incremental/php/FiveFourteen.php @@ -10,48 +10,10 @@ */ /** - * Upgrade logic for FiveFourteen */ + * Upgrade logic for FiveFourteen + */ class CRM_Upgrade_Incremental_php_FiveFourteen extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * @@ -59,9 +21,6 @@ class CRM_Upgrade_Incremental_php_FiveFourteen extends CRM_Upgrade_Incremental_B */ public function upgrade_5_14_alpha1($rev) { // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // Additional tasks here... - // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. } } diff --git a/CRM/Upgrade/Incremental/php/FiveNine.php b/CRM/Upgrade/Incremental/php/FiveNine.php index 2addbd15e8..a201989296 100644 --- a/CRM/Upgrade/Incremental/php/FiveNine.php +++ b/CRM/Upgrade/Incremental/php/FiveNine.php @@ -10,27 +10,10 @@ */ /** - * Upgrade logic for FiveNine */ + * Upgrade logic for FiveNine + */ class CRM_Upgrade_Incremental_php_FiveNine extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - /** * Compute any messages which should be displayed after upgrade. * @@ -49,34 +32,6 @@ class CRM_Upgrade_Incremental_php_FiveNine extends CRM_Upgrade_Incremental_Base '

' . ts('If you were previously on version 5.8 and altered the WYSIWYG editor setting, you should visit the Display Preferences page and re-save the WYSIWYG editor setting.', [1 => 'href="' . CRM_Utils_System::url('civicrm/admin/setting/preferences/display', 'reset=1') . '"']) . '

' . '

' . ts('CiviCRM v5.9+ adds a new search preference for certain custom-fields ("Money", "Integer", or "Float" data displayed as "Select" or "Radio" fields). For continuity, any old fields have been set to continue the old user-experience. However, you may want to review these settings. (You should especially review if this site used v5.9-alpha or v5.9-beta.)') . '

'; } - - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveNineteen.php b/CRM/Upgrade/Incremental/php/FiveNineteen.php index 5ebb867b5e..424288bdab 100644 --- a/CRM/Upgrade/Incremental/php/FiveNineteen.php +++ b/CRM/Upgrade/Incremental/php/FiveNineteen.php @@ -10,42 +10,10 @@ */ /** - * Upgrade logic for FiveNineteen */ + * Upgrade logic for FiveNineteen + */ class CRM_Upgrade_Incremental_php_FiveNineteen extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveOne.php b/CRM/Upgrade/Incremental/php/FiveOne.php index 7e28d494c8..ae5e8c6032 100644 --- a/CRM/Upgrade/Incremental/php/FiveOne.php +++ b/CRM/Upgrade/Incremental/php/FiveOne.php @@ -10,63 +10,8 @@ */ /** - * Upgrade logic for FiveOne */ + * Upgrade logic for FiveOne + */ class CRM_Upgrade_Incremental_php_FiveOne extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveSeven.php b/CRM/Upgrade/Incremental/php/FiveSeven.php index 3b5ae41024..ea262090f6 100644 --- a/CRM/Upgrade/Incremental/php/FiveSeven.php +++ b/CRM/Upgrade/Incremental/php/FiveSeven.php @@ -10,63 +10,7 @@ */ /** - * Upgrade logic for FiveSeven */ + * Upgrade logic for FiveSeven + */ class CRM_Upgrade_Incremental_php_FiveSeven extends CRM_Upgrade_Incremental_Base { - - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveSeventeen.php b/CRM/Upgrade/Incremental/php/FiveSeventeen.php index 4560afa58f..71a28f9acb 100644 --- a/CRM/Upgrade/Incremental/php/FiveSeventeen.php +++ b/CRM/Upgrade/Incremental/php/FiveSeventeen.php @@ -10,65 +10,10 @@ */ /** - * Upgrade logic for FiveSeventeen */ + * Upgrade logic for FiveSeventeen + */ class CRM_Upgrade_Incremental_php_FiveSeventeen extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveSix.php b/CRM/Upgrade/Incremental/php/FiveSix.php index ac31fa6728..49ce79964d 100644 --- a/CRM/Upgrade/Incremental/php/FiveSix.php +++ b/CRM/Upgrade/Incremental/php/FiveSix.php @@ -10,48 +10,10 @@ */ /** - * Upgrade logic for FiveSix */ + * Upgrade logic for FiveSix + */ class CRM_Upgrade_Incremental_php_FiveSix extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission has been added called %1 This Permission is now used to control access to the Manage Tags screen', array(1 => 'manage tags')) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveSixteen.php b/CRM/Upgrade/Incremental/php/FiveSixteen.php index 34a63c2db5..90ff9e2c78 100644 --- a/CRM/Upgrade/Incremental/php/FiveSixteen.php +++ b/CRM/Upgrade/Incremental/php/FiveSixteen.php @@ -10,61 +10,10 @@ */ /** - * Upgrade logic for FiveSixteen */ + * Upgrade logic for FiveSixteen + */ class CRM_Upgrade_Incremental_php_FiveSixteen extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - /** * Upgrade function. * @@ -88,8 +37,4 @@ class CRM_Upgrade_Incremental_php_FiveSixteen extends CRM_Upgrade_Incremental_Ba ]); } - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveTen.php b/CRM/Upgrade/Incremental/php/FiveTen.php index 456ba478c6..61766d1035 100644 --- a/CRM/Upgrade/Incremental/php/FiveTen.php +++ b/CRM/Upgrade/Incremental/php/FiveTen.php @@ -10,63 +10,8 @@ */ /** - * Upgrade logic for FiveTen */ + * Upgrade logic for FiveTen + */ class CRM_Upgrade_Incremental_php_FiveTen extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveThirteen.php b/CRM/Upgrade/Incremental/php/FiveThirteen.php index 0e507758b9..c898677d06 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirteen.php +++ b/CRM/Upgrade/Incremental/php/FiveThirteen.php @@ -10,27 +10,10 @@ */ /** - * Upgrade logic for FiveThirteen */ + * Upgrade logic for FiveThirteen + */ class CRM_Upgrade_Incremental_php_FiveThirteen extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - /** * Compute any messages which should be displayed after upgrade. * @@ -47,12 +30,6 @@ class CRM_Upgrade_Incremental_php_FiveThirteen extends CRM_Upgrade_Incremental_B } } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveThirty.php b/CRM/Upgrade/Incremental/php/FiveThirty.php index 8ccaf073f3..3faabda7e5 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirty.php +++ b/CRM/Upgrade/Incremental/php/FiveThirty.php @@ -10,61 +10,10 @@ */ /** - * Upgrade logic for FiveThirty */ + * Upgrade logic for FiveThirty + */ class CRM_Upgrade_Incremental_php_FiveThirty extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - /** * Upgrade function. * @@ -75,10 +24,6 @@ class CRM_Upgrade_Incremental_php_FiveThirty extends CRM_Upgrade_Incremental_Bas $this->addTask('Add core (required) extension Financial ACLs', 'installFinancialAcls'); } - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - /** * Install financialacls extension. * diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyEight.php b/CRM/Upgrade/Incremental/php/FiveThirtyEight.php index adecfd57d9..b63057cca0 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirtyEight.php +++ b/CRM/Upgrade/Incremental/php/FiveThirtyEight.php @@ -10,51 +10,10 @@ */ /** - * Upgrade logic for FiveThirtyEight */ + * Upgrade logic for FiveThirtyEight + */ class CRM_Upgrade_Incremental_php_FiveThirtyEight extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * @@ -98,21 +57,4 @@ class CRM_Upgrade_Incremental_php_FiveThirtyEight extends CRM_Upgrade_Incrementa return TRUE; } - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyFive.php b/CRM/Upgrade/Incremental/php/FiveThirtyFive.php index 5d3ac9b3d8..7d3e3f3c5a 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirtyFive.php +++ b/CRM/Upgrade/Incremental/php/FiveThirtyFive.php @@ -10,48 +10,10 @@ */ /** - * Upgrade logic for FiveThirtyFive */ + * Upgrade logic for FiveThirtyFive + */ class CRM_Upgrade_Incremental_php_FiveThirtyFive extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyFour.php b/CRM/Upgrade/Incremental/php/FiveThirtyFour.php index ef777762be..7c6c496876 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirtyFour.php +++ b/CRM/Upgrade/Incremental/php/FiveThirtyFour.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveThirtyFour */ + * Upgrade logic for FiveThirtyFour + */ class CRM_Upgrade_Incremental_php_FiveThirtyFour extends CRM_Upgrade_Incremental_Base { /** @@ -109,12 +110,6 @@ class CRM_Upgrade_Incremental_php_FiveThirtyFour extends CRM_Upgrade_Incremental } } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyNine.php b/CRM/Upgrade/Incremental/php/FiveThirtyNine.php index 0661a7e706..73ef411681 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirtyNine.php +++ b/CRM/Upgrade/Incremental/php/FiveThirtyNine.php @@ -10,51 +10,10 @@ */ /** - * Upgrade logic for FiveThirtyNine */ + * Upgrade logic for FiveThirtyNine + */ class CRM_Upgrade_Incremental_php_FiveThirtyNine extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php index 34da4fef69..5c7eeacf3e 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php +++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php @@ -10,48 +10,10 @@ */ /** - * Upgrade logic for FiveThirtyOne */ + * Upgrade logic for FiveThirtyOne + */ class CRM_Upgrade_Incremental_php_FiveThirtyOne extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveThirtySeven.php b/CRM/Upgrade/Incremental/php/FiveThirtySeven.php index f87d2effe6..b773ab8a9f 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirtySeven.php +++ b/CRM/Upgrade/Incremental/php/FiveThirtySeven.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveThirtySeven */ + * Upgrade logic for FiveThirtySeven + */ class CRM_Upgrade_Incremental_php_FiveThirtySeven extends CRM_Upgrade_Incremental_Base { /** @@ -35,30 +36,6 @@ class CRM_Upgrade_Incremental_php_FiveThirtySeven extends CRM_Upgrade_Incrementa } } - /** - * Compute any messages which should be displayed after upgrade. - * - * Note: This function is called iteratively for each incremental upgrade step. - * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * @@ -76,19 +53,6 @@ class CRM_Upgrade_Incremental_php_FiveThirtySeven extends CRM_Upgrade_Incrementa $this->addTask('Install reCAPTCHA extension', 'installReCaptchaExtension'); } - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - /** * @param \CRM_Queue_TaskContext $ctx * diff --git a/CRM/Upgrade/Incremental/php/FiveThirtySix.php b/CRM/Upgrade/Incremental/php/FiveThirtySix.php index e4e0047328..78ef2eb8c5 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirtySix.php +++ b/CRM/Upgrade/Incremental/php/FiveThirtySix.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveThirtySix */ + * Upgrade logic for FiveThirtySix + */ class CRM_Upgrade_Incremental_php_FiveThirtySix extends CRM_Upgrade_Incremental_Base { /** @@ -40,27 +41,6 @@ class CRM_Upgrade_Incremental_php_FiveThirtySix extends CRM_Upgrade_Incremental_ } } - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyThree.php b/CRM/Upgrade/Incremental/php/FiveThirtyThree.php index 391779d589..35a32dde06 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirtyThree.php +++ b/CRM/Upgrade/Incremental/php/FiveThirtyThree.php @@ -10,42 +10,10 @@ */ /** - * Upgrade logic for FiveThirtyThree */ + * Upgrade logic for FiveThirtyThree + */ class CRM_Upgrade_Incremental_php_FiveThirtyThree extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyTwo.php b/CRM/Upgrade/Incremental/php/FiveThirtyTwo.php index 14e1412333..dbaa6ab6be 100644 --- a/CRM/Upgrade/Incremental/php/FiveThirtyTwo.php +++ b/CRM/Upgrade/Incremental/php/FiveThirtyTwo.php @@ -14,39 +14,6 @@ */ class CRM_Upgrade_Incremental_php_FiveThirtyTwo extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - /** * Install contributioncancelactions extension. * diff --git a/CRM/Upgrade/Incremental/php/FiveThree.php b/CRM/Upgrade/Incremental/php/FiveThree.php index df00a1b9eb..1cb11f77f3 100644 --- a/CRM/Upgrade/Incremental/php/FiveThree.php +++ b/CRM/Upgrade/Incremental/php/FiveThree.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveThree */ + * Upgrade logic for FiveThree + */ class CRM_Upgrade_Incremental_php_FiveThree extends CRM_Upgrade_Incremental_Base { /** @@ -39,21 +40,6 @@ class CRM_Upgrade_Incremental_php_FiveThree extends CRM_Upgrade_Incremental_Base // } } - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - /** * Upgrade function. * @@ -81,27 +67,4 @@ class CRM_Upgrade_Incremental_php_FiveThree extends CRM_Upgrade_Incremental_Base return TRUE; } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveTwelve.php b/CRM/Upgrade/Incremental/php/FiveTwelve.php index db70c3e410..497dbaf86f 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwelve.php +++ b/CRM/Upgrade/Incremental/php/FiveTwelve.php @@ -10,48 +10,10 @@ */ /** - * Upgrade logic for FiveTwelve */ + * Upgrade logic for FiveTwelve + */ class CRM_Upgrade_Incremental_php_FiveTwelve extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwenty.php b/CRM/Upgrade/Incremental/php/FiveTwenty.php index 4ba3102d98..df77f052c8 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwenty.php +++ b/CRM/Upgrade/Incremental/php/FiveTwenty.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveTwenty */ + * Upgrade logic for FiveTwenty + */ class CRM_Upgrade_Incremental_php_FiveTwenty extends CRM_Upgrade_Incremental_Base { /** @@ -49,31 +50,6 @@ class CRM_Upgrade_Incremental_php_FiveTwenty extends CRM_Upgrade_Incremental_Bas } } - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyEight.php b/CRM/Upgrade/Incremental/php/FiveTwentyEight.php index e765ee4be5..38a0ceb713 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentyEight.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentyEight.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveTwentyEight */ + * Upgrade logic for FiveTwentyEight + */ class CRM_Upgrade_Incremental_php_FiveTwentyEight extends CRM_Upgrade_Incremental_Base { /** @@ -73,12 +74,6 @@ class CRM_Upgrade_Incremental_php_FiveTwentyEight extends CRM_Upgrade_Incrementa ]) . '

' . $table; } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyFive.php b/CRM/Upgrade/Incremental/php/FiveTwentyFive.php index 0343d4faab..2b6a045c65 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentyFive.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentyFive.php @@ -10,65 +10,10 @@ */ /** - * Upgrade logic for FiveTwentyFive */ + * Upgrade logic for FiveTwentyFive + */ class CRM_Upgrade_Incremental_php_FiveTwentyFive extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyFour.php b/CRM/Upgrade/Incremental/php/FiveTwentyFour.php index e43e22d2dd..b34afcf7b0 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentyFour.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentyFour.php @@ -10,42 +10,10 @@ */ /** - * Upgrade logic for FiveTwentyFour */ + * Upgrade logic for FiveTwentyFour + */ class CRM_Upgrade_Incremental_php_FiveTwentyFour extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyNine.php b/CRM/Upgrade/Incremental/php/FiveTwentyNine.php index 6980067cb2..de6ffb7808 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentyNine.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentyNine.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveTwentyNine */ + * Upgrade logic for FiveTwentyNine + */ class CRM_Upgrade_Incremental_php_FiveTwentyNine extends CRM_Upgrade_Incremental_Base { /** @@ -32,27 +33,6 @@ class CRM_Upgrade_Incremental_php_FiveTwentyNine extends CRM_Upgrade_Incremental } } - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyOne.php b/CRM/Upgrade/Incremental/php/FiveTwentyOne.php index 2319acd0ae..e345c04639 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentyOne.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentyOne.php @@ -10,27 +10,10 @@ */ /** - * Upgrade logic for FiveTwentyOne */ + * Upgrade logic for FiveTwentyOne + */ class CRM_Upgrade_Incremental_php_FiveTwentyOne extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - /** * Compute any messages which should be displayed after upgrade. * @@ -56,25 +39,6 @@ class CRM_Upgrade_Incremental_php_FiveTwentyOne extends CRM_Upgrade_Incremental_ } } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwentySeven.php b/CRM/Upgrade/Incremental/php/FiveTwentySeven.php index f7f307c6c0..ee1ae9a65d 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentySeven.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentySeven.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveTwentySeven */ + * Upgrade logic for FiveTwentySeven + */ class CRM_Upgrade_Incremental_php_FiveTwentySeven extends CRM_Upgrade_Incremental_Base { /** @@ -34,27 +35,6 @@ class CRM_Upgrade_Incremental_php_FiveTwentySeven extends CRM_Upgrade_Incrementa } } - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwentySix.php b/CRM/Upgrade/Incremental/php/FiveTwentySix.php index cc04839d95..a5ba869a88 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentySix.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentySix.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveTwentySix */ + * Upgrade logic for FiveTwentySix + */ class CRM_Upgrade_Incremental_php_FiveTwentySix extends CRM_Upgrade_Incremental_Base { /** @@ -55,12 +56,6 @@ class CRM_Upgrade_Incremental_php_FiveTwentySix extends CRM_Upgrade_Incremental_ } } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyThree.php b/CRM/Upgrade/Incremental/php/FiveTwentyThree.php index 4803387fc0..df9e4d4842 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentyThree.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentyThree.php @@ -10,7 +10,8 @@ */ /** - * Upgrade logic for FiveTwentyThree */ + * Upgrade logic for FiveTwentyThree + */ class CRM_Upgrade_Incremental_php_FiveTwentyThree extends CRM_Upgrade_Incremental_Base { /** @@ -39,40 +40,6 @@ class CRM_Upgrade_Incremental_php_FiveTwentyThree extends CRM_Upgrade_Incrementa } } - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - /** * Upgrade function. * diff --git a/CRM/Upgrade/Incremental/php/FiveTwentyTwo.php b/CRM/Upgrade/Incremental/php/FiveTwentyTwo.php index ae5cf56a48..d35caf2bfa 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwentyTwo.php +++ b/CRM/Upgrade/Incremental/php/FiveTwentyTwo.php @@ -10,63 +10,8 @@ */ /** - * Upgrade logic for FiveTwentyTwo */ + * Upgrade logic for FiveTwentyTwo + */ class CRM_Upgrade_Incremental_php_FiveTwentyTwo extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - // if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - // } - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveTwo.php b/CRM/Upgrade/Incremental/php/FiveTwo.php index c4f35cb654..ecc418566a 100644 --- a/CRM/Upgrade/Incremental/php/FiveTwo.php +++ b/CRM/Upgrade/Incremental/php/FiveTwo.php @@ -10,59 +10,8 @@ */ /** - * Upgrade logic for FiveTwo */ + * Upgrade logic for FiveTwo + */ class CRM_Upgrade_Incremental_php_FiveTwo extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - // if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - // } - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_5_0_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask('Do the foo change', 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FiveZero.php b/CRM/Upgrade/Incremental/php/FiveZero.php index 6fdae40a39..d0dbc490cd 100644 --- a/CRM/Upgrade/Incremental/php/FiveZero.php +++ b/CRM/Upgrade/Incremental/php/FiveZero.php @@ -14,60 +14,4 @@ */ class CRM_Upgrade_Incremental_php_FiveZero extends CRM_Upgrade_Incremental_Base { - /** - * Compute any messages which should be displayed beforeupgrade. - * - * Note: This function is called iteratively for each upcoming - * revision to the database. - * - * @param string $preUpgradeMessage - * @param string $rev - * a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'. - * @param null $currentVer - */ - public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) { - // Example: Generate a pre-upgrade message. - //if ($rev == '5.12.34') { - // $preUpgradeMessage .= '

' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; - //} - } - - /** - * Compute any messages which should be displayed after upgrade. - * - * @param string $postUpgradeMessage - * alterable. - * @param string $rev - * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. - */ - public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { - // Example: Generate a post-upgrade message. - //if ($rev == '5.12.34') { - // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); - //} - } - - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_4_7_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // $this->addTask(ts('Do the foo change'), 'taskFoo', ...); - // // Additional tasks here... - // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. - // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. - // } - - // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { - // return TRUE; - // } - } diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index 74f190a0f2..c4affbe683 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -496,12 +496,6 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base "date DEFAULT NULL COMMENT 'The end date of membership status override if (Override until selected date) override type is selected.'"); } - /* - * Important! All upgrade functions MUST add a 'runSql' task. - * Uncomment and use the following template for a new upgrade version - * (change the x in the function name): - */ - // /** // * Upgrade function. // * -- 2.25.1