Civix upgrade message_admin

diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml
index 802b24e46f1aa6926caa431123d1d03c7a78c3dd..cc8bdbd41a16f3c1fff038886b5033d67b05058a 100644 (file)
--- a/ext/message_admin/info.xml
+++ b/ext/message_admin/info.xml
@@ -34,6 +34,6 @@
   </mixins>
   <civix>
     <namespace>CRM/MessageAdmin</namespace>
-    <format>22.10.0</format>
+    <format>22.12.1</format>
   </civix>
 </extension>

diff --git a/ext/message_admin/message_admin.civix.php b/ext/message_admin/message_admin.civix.php
index 14af7812f49b6b40562f52923452bfc927a2aac2..b386a62dc72dc94c064415741459afc7d43bc7fe 100644 (file)
--- a/ext/message_admin/message_admin.civix.php
+++ b/ext/message_admin/message_admin.civix.php
@@ -84,27 +84,20 @@ use CRM_MessageAdmin_ExtensionUtil as E;
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
  */
-function _message_admin_civix_civicrm_config(&$config = NULL) {
+function _message_admin_civix_civicrm_config($config = NULL) {
   static $configured = FALSE;
   if ($configured) {
     return;
   }
   $configured = TRUE;
 
-  $template = CRM_Core_Smarty::singleton();
-
   $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
-
-  if (is_array($template->template_dir)) {
-    array_unshift($template->template_dir, $extDir);
-  }
-  else {
-    $template->template_dir = [$extDir, $template->template_dir];
-  }
+  CRM_Core_Smarty::singleton()->addTemplateDir($extDir);
 
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
   set_include_path($include_path);
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
 }
 
 /**
@@ -114,35 +107,7 @@ function _message_admin_civix_civicrm_config(&$config = NULL) {
  */
 function _message_admin_civix_civicrm_install() {
   _message_admin_civix_civicrm_config();
-  if ($upgrader = _message_admin_civix_upgrader()) {
-    $upgrader->onInstall();
-  }
-}
-
-/**
- * Implements hook_civicrm_postInstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
- */
-function _message_admin_civix_civicrm_postInstall() {
-  _message_admin_civix_civicrm_config();
-  if ($upgrader = _message_admin_civix_upgrader()) {
-    if (is_callable([$upgrader, 'onPostInstall'])) {
-      $upgrader->onPostInstall();
-    }
-  }
-}
-
-/**
- * Implements hook_civicrm_uninstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
- */
-function _message_admin_civix_civicrm_uninstall(): void {
-  _message_admin_civix_civicrm_config();
-  if ($upgrader = _message_admin_civix_upgrader()) {
-    $upgrader->onUninstall();
-  }
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
 }
 
 /**
@@ -152,56 +117,7 @@ function _message_admin_civix_civicrm_uninstall(): void {
  */
 function _message_admin_civix_civicrm_enable(): void {
   _message_admin_civix_civicrm_config();
-  if ($upgrader = _message_admin_civix_upgrader()) {
-    if (is_callable([$upgrader, 'onEnable'])) {
-      $upgrader->onEnable();
-    }
-  }
-}
-
-/**
- * (Delegated) Implements hook_civicrm_disable().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
- * @return mixed
- */
-function _message_admin_civix_civicrm_disable(): void {
-  _message_admin_civix_civicrm_config();
-  if ($upgrader = _message_admin_civix_upgrader()) {
-    if (is_callable([$upgrader, 'onDisable'])) {
-      $upgrader->onDisable();
-    }
-  }
-}
-
-/**
- * (Delegated) Implements hook_civicrm_upgrade().
- *
- * @param $op string, the type of operation being performed; 'check' or 'enqueue'
- * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
- *
- * @return mixed
- *   based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
- *   for 'enqueue', returns void
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
- */
-function _message_admin_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
-  if ($upgrader = _message_admin_civix_upgrader()) {
-    return $upgrader->onUpgrade($op, $queue);
-  }
-}
-
-/**
- * @return CRM_MessageAdmin_Upgrader
- */
-function _message_admin_civix_upgrader() {
-  if (!file_exists(__DIR__ . '/CRM/MessageAdmin/Upgrader.php')) {
-    return NULL;
-  }
-  else {
-    return CRM_MessageAdmin_Upgrader_Base::instance();
-  }
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
 }
 
 /**

diff --git a/ext/message_admin/message_admin.php b/ext/message_admin/message_admin.php
index 4f9bd7b47540b468a347422193be38e174761629..872e322729f4fbee94b61262979ef47e1e8b5fe0 100644 (file)
--- a/ext/message_admin/message_admin.php
+++ b/ext/message_admin/message_admin.php
@@ -23,24 +23,6 @@ function message_admin_civicrm_install() {
   _message_admin_civix_civicrm_install();
 }
 
-/**
- * Implements hook_civicrm_postInstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
- */
-function message_admin_civicrm_postInstall() {
-  _message_admin_civix_civicrm_postInstall();
-}
-
-/**
- * Implements hook_civicrm_uninstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
- */
-function message_admin_civicrm_uninstall() {
-  _message_admin_civix_civicrm_uninstall();
-}
-
 /**
  * Implements hook_civicrm_enable().
  *
@@ -50,24 +32,6 @@ function message_admin_civicrm_enable() {
   _message_admin_civix_civicrm_enable();
 }
 
-/**
- * Implements hook_civicrm_disable().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
- */
-function message_admin_civicrm_disable() {
-  _message_admin_civix_civicrm_disable();
-}
-
-/**
- * Implements hook_civicrm_upgrade().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
- */
-function message_admin_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
-  return _message_admin_civix_civicrm_upgrade($op, $queue);
-}
-
 /**
  * Implements hook_civicrm_entityTypes().
  *