From ce1579af4a0a9ad9be387a7458fe1a4b7941af83 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 22 Mar 2022 17:17:37 -0700
Subject: [PATCH] dev/core#2122 - For 5.48.beta2, use TimezoneRevertTrait and
 updates msg tpls

---
 CRM/Upgrade/Incremental/MessageTemplates.php  |  2 +-
 .../Incremental/php/FiveFortyEight.php        | 47 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/CRM/Upgrade/Incremental/MessageTemplates.php b/CRM/Upgrade/Incremental/MessageTemplates.php
index a46359bb54..bf9c443a39 100644
--- a/CRM/Upgrade/Incremental/MessageTemplates.php
+++ b/CRM/Upgrade/Incremental/MessageTemplates.php
@@ -323,7 +323,7 @@ class CRM_Upgrade_Incremental_MessageTemplates {
         ],
       ],
       [
-        'version' => '5.48.beta1',
+        'version' => '5.48.beta2',
         'upgrade_descriptor' => ts('Revert time zone for Event dates'),
         'templates' => [
           ['name' => 'event_online_receipt', 'type' => 'html'],
diff --git a/CRM/Upgrade/Incremental/php/FiveFortyEight.php b/CRM/Upgrade/Incremental/php/FiveFortyEight.php
index 18f112597f..e92d9331b1 100644
--- a/CRM/Upgrade/Incremental/php/FiveFortyEight.php
+++ b/CRM/Upgrade/Incremental/php/FiveFortyEight.php
@@ -21,6 +21,42 @@
  */
 class CRM_Upgrade_Incremental_php_FiveFortyEight extends CRM_Upgrade_Incremental_Base {
 
+  use CRM_Upgrade_Incremental_php_TimezoneRevertTrait;
+
+  /**
+   * 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 {
+    if ($rev === '5.48.beta2') {
+      $preUpgradeMessage .= $this->createEventTzPreUpgradeMessage();
+    }
+  }
+
+  /**
+   * 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 {
+    if ($rev === '5.48.beta2') {
+      $postUpgradeMessage .= $this->createEventTzPostUpgradeMessage();
+    }
+  }
+
   /**
    * Upgrade step; adds tasks including 'runSql'.
    *
@@ -48,6 +84,17 @@ class CRM_Upgrade_Incremental_php_FiveFortyEight extends CRM_Upgrade_Incremental
     );
   }
 
+  /**
+   * Upgrade step; adds tasks including 'runSql'.
+   *
+   * @param string $rev
+   *   The version number matching this function name
+   */
+  public function upgrade_5_48_beta2($rev): void {
+    // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    $this->addEventTzTasks();
+  }
+
   /**
    * The `is_autorun` column was introduced in 5.47,  but we didn't finish adding the
    * additional changes to use, so there shouldn't be any real usage. But just to be
-- 
2.25.1