From c3170cf96320ecd9445d52a9faa68a8a1535c16b Mon Sep 17 00:00:00 2001 From: CiviCRM Date: Tue, 7 Dec 2021 21:48:15 +0000 Subject: [PATCH] Set version to 5.46.alpha1 --- CRM/Upgrade/Incremental/php/FiveFortySix.php | 75 +++++++++++++++++++ .../Incremental/sql/5.46.alpha1.mysql.tpl | 1 + ext/afform/admin/info.xml | 2 +- ext/afform/core/info.xml | 2 +- ext/afform/html/info.xml | 2 +- ext/afform/mock/info.xml | 2 +- ext/authx/info.xml | 2 +- ext/ckeditor4/info.xml | 2 +- ext/contributioncancelactions/info.xml | 2 +- ext/eventcart/info.xml | 2 +- ext/ewaysingle/info.xml | 2 +- ext/financialacls/info.xml | 2 +- ext/flexmailer/info.xml | 2 +- ext/greenwich/info.xml | 2 +- ext/legacycustomsearches/info.xml | 2 +- ext/message_admin/info.xml | 2 +- ext/oauth-client/info.xml | 2 +- ext/payflowpro/info.xml | 2 +- ext/recaptcha/info.xml | 2 +- ext/search_kit/info.xml | 2 +- ext/sequentialcreditnotes/info.xml | 2 +- sql/civicrm_generated.mysql | 2 +- sql/test_data_second_domain.mysql | 2 +- xml/version.xml | 2 +- 24 files changed, 98 insertions(+), 22 deletions(-) create mode 100644 CRM/Upgrade/Incremental/php/FiveFortySix.php create mode 100644 CRM/Upgrade/Incremental/sql/5.46.alpha1.mysql.tpl diff --git a/CRM/Upgrade/Incremental/php/FiveFortySix.php b/CRM/Upgrade/Incremental/php/FiveFortySix.php new file mode 100644 index 0000000000..6b94c7836b --- /dev/null +++ b/CRM/Upgrade/Incremental/php/FiveFortySix.php @@ -0,0 +1,75 @@ +' . 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'."); + // } + } + + /* + * 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): void { + // $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, ...): bool { + // return TRUE; + // } + +} diff --git a/CRM/Upgrade/Incremental/sql/5.46.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.46.alpha1.mysql.tpl new file mode 100644 index 0000000000..5d4f7c26bc --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/5.46.alpha1.mysql.tpl @@ -0,0 +1 @@ +{* file to handle db changes in 5.46.alpha1 during upgrade *} diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml index c21c0f4e24..0e05b8ea13 100644 --- a/ext/afform/admin/info.xml +++ b/ext/afform/admin/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.45.beta1 + 5.46.alpha1 beta 5.23 diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml index 218fd1a64d..29a5a87145 100644 --- a/ext/afform/core/info.xml +++ b/ext/afform/core/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.45.beta1 + 5.46.alpha1 beta 5.23 diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml index 808afc2843..3982fe41de 100644 --- a/ext/afform/html/info.xml +++ b/ext/afform/html/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.45.beta1 + 5.46.alpha1 alpha 5.23 diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml index 4bace94914..e987f73102 100644 --- a/ext/afform/mock/info.xml +++ b/ext/afform/mock/info.xml @@ -12,7 +12,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.45.beta1 + 5.46.alpha1 mgmt:hidden diff --git a/ext/authx/info.xml b/ext/authx/info.xml index fd93b09a27..a3a3f1ebf5 100644 --- a/ext/authx/info.xml +++ b/ext/authx/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-02-11 - 5.45.beta1 + 5.46.alpha1 alpha 5.0 diff --git a/ext/ckeditor4/info.xml b/ext/ckeditor4/info.xml index 3fc46186a0..91875ce1ad 100644 --- a/ext/ckeditor4/info.xml +++ b/ext/ckeditor4/info.xml @@ -15,7 +15,7 @@ https://www.gnu.org/licenses/agpl-3.0.html 2021-05-23 - 5.45.beta1 + 5.46.alpha1 stable 5.39 diff --git a/ext/contributioncancelactions/info.xml b/ext/contributioncancelactions/info.xml index 00ad9edcba..ca84f7601c 100644 --- a/ext/contributioncancelactions/info.xml +++ b/ext/contributioncancelactions/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-12 - 5.45.beta1 + 5.46.alpha1 stable 5.32 diff --git a/ext/eventcart/info.xml b/ext/eventcart/info.xml index 2b79a3933e..edda96322a 100644 --- a/ext/eventcart/info.xml +++ b/ext/eventcart/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-03 - 5.45.beta1 + 5.46.alpha1 mgmt:hidden diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml index 060f428140..cebd56af26 100644 --- a/ext/ewaysingle/info.xml +++ b/ext/ewaysingle/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-07 - 5.45.beta1 + 5.46.alpha1 mgmt:hidden diff --git a/ext/financialacls/info.xml b/ext/financialacls/info.xml index e2e684ae3d..516c8f2f98 100644 --- a/ext/financialacls/info.xml +++ b/ext/financialacls/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-27 - 5.45.beta1 + 5.46.alpha1 stable 5.30 diff --git a/ext/flexmailer/info.xml b/ext/flexmailer/info.xml index 4b710f1ca3..4805c9b86c 100644 --- a/ext/flexmailer/info.xml +++ b/ext/flexmailer/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-05 - 5.45.beta1 + 5.46.alpha1 stable FlexMailer is an email delivery engine which replaces the internal guts diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml index 21d4de44fc..dad76aca38 100644 --- a/ext/greenwich/info.xml +++ b/ext/greenwich/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-07-21 - 5.45.beta1 + 5.46.alpha1 mgmt:hidden diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml index d4740ed222..f0621f6704 100644 --- a/ext/legacycustomsearches/info.xml +++ b/ext/legacycustomsearches/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-07-25 - 5.45.beta1 + 5.46.alpha1 stable mgmt:hidden diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml index abc28b43a5..ab46cb3852 100644 --- a/ext/message_admin/info.xml +++ b/ext/message_admin/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-06-12 - 5.45.beta1 + 5.46.alpha1 mgmt:hidden diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml index c4f6c57e11..310685c365 100644 --- a/ext/oauth-client/info.xml +++ b/ext/oauth-client/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-23 - 5.45.beta1 + 5.46.alpha1 stable 5.38 diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml index db0800d687..642f995b69 100644 --- a/ext/payflowpro/info.xml +++ b/ext/payflowpro/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-04-13 - 5.45.beta1 + 5.46.alpha1 stable 5.0 diff --git a/ext/recaptcha/info.xml b/ext/recaptcha/info.xml index 64b0399c3e..5d97c0e6a5 100644 --- a/ext/recaptcha/info.xml +++ b/ext/recaptcha/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-04-03 - 5.45.beta1 + 5.46.alpha1 mgmt:hidden diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml index 67013aefb0..2b061a5953 100644 --- a/ext/search_kit/info.xml +++ b/ext/search_kit/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-01-06 - 5.45.beta1 + 5.46.alpha1 beta 5.38 diff --git a/ext/sequentialcreditnotes/info.xml b/ext/sequentialcreditnotes/info.xml index c323ebb28b..c685280e86 100644 --- a/ext/sequentialcreditnotes/info.xml +++ b/ext/sequentialcreditnotes/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-28 - 5.45.beta1 + 5.46.alpha1 mgmt:hidden diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index d9203e4536..c493061f3b 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -2896,7 +2896,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES - (1,'Default Domain Name',NULL,'5.45.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.46.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql index 2b28cade0b..95e0907f64 100644 --- a/sql/test_data_second_domain.mysql +++ b/sql/test_data_second_domain.mysql @@ -963,4 +963,4 @@ INSERT INTO civicrm_navigation VALUES ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'), 'Mailing Detail Report', 'Mailing Detail Report', 'administer CiviMail', 'OR', @reportlastID, '1', NULL, @instanceID+2 ); UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID; -UPDATE civicrm_domain SET version = '5.45.beta1'; +UPDATE civicrm_domain SET version = '5.46.alpha1'; diff --git a/xml/version.xml b/xml/version.xml index a867798ef4..6125c30d23 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 5.45.beta1 + 5.46.alpha1 -- 2.25.1