Merge pull request #25249 from eileenmcnaughton/improve_add

Greenwich - Run `civix upgrade`
civicrm · Jan 18, 2023 · a8661ef · a8661ef
2 parents c33fb61 + bbe46bb
commit a8661ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 90 deletions.
diff --git a/ext/greenwich/greenwich.civix.php b/ext/greenwich/greenwich.civix.php
@@ -84,27 +84,20 @@ public static function findClass($suffix) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
  */
-function _greenwich_civix_civicrm_config(&$config = NULL) {
+function _greenwich_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 _greenwich_civix_civicrm_config(&$config = NULL) {
  */
 function _greenwich_civix_civicrm_install() {
   _greenwich_civix_civicrm_config();
-  if ($upgrader = _greenwich_civix_upgrader()) {
-    $upgrader->onInstall();
-  }
-}
-
-/**
- * Implements hook_civicrm_postInstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
- */
-function _greenwich_civix_civicrm_postInstall() {
-  _greenwich_civix_civicrm_config();
-  if ($upgrader = _greenwich_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 _greenwich_civix_civicrm_uninstall(): void {
-  _greenwich_civix_civicrm_config();
-  if ($upgrader = _greenwich_civix_upgrader()) {
-    $upgrader->onUninstall();
-  }
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
 }
 
 /**
@@ -152,56 +117,7 @@ function _greenwich_civix_civicrm_uninstall(): void {
  */
 function _greenwich_civix_civicrm_enable(): void {
   _greenwich_civix_civicrm_config();
-  if ($upgrader = _greenwich_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 _greenwich_civix_civicrm_disable(): void {
-  _greenwich_civix_civicrm_config();
-  if ($upgrader = _greenwich_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 _greenwich_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
-  if ($upgrader = _greenwich_civix_upgrader()) {
-    return $upgrader->onUpgrade($op, $queue);
-  }
-}
-
-/**
- * @return CRM_Greenwich_Upgrader
- */
-function _greenwich_civix_upgrader() {
-  if (!file_exists(__DIR__ . '/CRM/Greenwich/Upgrader.php')) {
-    return NULL;
-  }
-  else {
-    return CRM_Greenwich_Upgrader_Base::instance();
-  }
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
 }
 
 /**

diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml
@@ -29,6 +29,6 @@
   </classloader>
   <civix>
     <namespace>CRM/Greenwich</namespace>
-    <format>22.10.0</format>
+    <format>22.12.1</format>
   </civix>
 </extension>