From 5dac303038f6376c8c1be6e9a4bf77a23ec733ea Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 24 Feb 2023 17:34:55 +1300
Subject: [PATCH] Civix update on legacyCustomSearches
---
ext/legacycustomsearches/info.xml | 3 +-
.../legacycustomsearches.civix.php | 106 +-----------------
.../legacycustomsearches.php | 47 --------
3 files changed, 6 insertions(+), 150 deletions(-)
diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml
index fda07e973e..9cde07957d 100644
--- a/ext/legacycustomsearches/info.xml
+++ b/ext/legacycustomsearches/info.xml
@@ -31,9 +31,10 @@
<mixins>
<mixin>menu-xml@1.0.0</mixin>
<mixin>mgd-php@1.0.0</mixin>
+ <mixin>smarty-v2@1.0.0</mixin>
</mixins>
<civix>
<namespace>CRM/Legacycustomsearches</namespace>
- <format>22.10.0</format>
+ <format>23.02.0</format>
</civix>
</extension>
diff --git a/ext/legacycustomsearches/legacycustomsearches.civix.php b/ext/legacycustomsearches/legacycustomsearches.civix.php
index b769c8311f..ffcb4eeb94 100644
--- a/ext/legacycustomsearches/legacycustomsearches.civix.php
+++ b/ext/legacycustomsearches/legacycustomsearches.civix.php
@@ -84,27 +84,17 @@ use CRM_Legacycustomsearches_ExtensionUtil as E;
*
* @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
*/
-function _legacycustomsearches_civix_civicrm_config(&$config = NULL) {
+function _legacycustomsearches_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];
- }
-
$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 +104,7 @@ function _legacycustomsearches_civix_civicrm_config(&$config = NULL) {
*/
function _legacycustomsearches_civix_civicrm_install() {
_legacycustomsearches_civix_civicrm_config();
- if ($upgrader = _legacycustomsearches_civix_upgrader()) {
- $upgrader->onInstall();
- }
-}
-
-/**
- * Implements hook_civicrm_postInstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
- */
-function _legacycustomsearches_civix_civicrm_postInstall() {
- _legacycustomsearches_civix_civicrm_config();
- if ($upgrader = _legacycustomsearches_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 _legacycustomsearches_civix_civicrm_uninstall(): void {
- _legacycustomsearches_civix_civicrm_config();
- if ($upgrader = _legacycustomsearches_civix_upgrader()) {
- $upgrader->onUninstall();
- }
+ // Based on <compatibility>, this does not currently require mixin/polyfill.php.
}
/**
@@ -152,56 +114,7 @@ function _legacycustomsearches_civix_civicrm_uninstall(): void {
*/
function _legacycustomsearches_civix_civicrm_enable(): void {
_legacycustomsearches_civix_civicrm_config();
- if ($upgrader = _legacycustomsearches_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 _legacycustomsearches_civix_civicrm_disable(): void {
- _legacycustomsearches_civix_civicrm_config();
- if ($upgrader = _legacycustomsearches_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 _legacycustomsearches_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
- if ($upgrader = _legacycustomsearches_civix_upgrader()) {
- return $upgrader->onUpgrade($op, $queue);
- }
-}
-
-/**
- * @return CRM_Legacycustomsearches_Upgrader
- */
-function _legacycustomsearches_civix_upgrader() {
- if (!file_exists(__DIR__ . '/CRM/Legacycustomsearches/Upgrader.php')) {
- return NULL;
- }
- else {
- return CRM_Legacycustomsearches_Upgrader_Base::instance();
- }
+ // Based on <compatibility>, this does not currently require mixin/polyfill.php.
}
/**
@@ -285,14 +198,3 @@ function _legacycustomsearches_civix_fixNavigationMenuItems(&$nodes, &$maxNavID,
}
}
}
-
-/**
- * (Delegated) Implements hook_civicrm_entityTypes().
- *
- * Find any *.entityType.php files, merge their content, and return.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
- */
-function _legacycustomsearches_civix_civicrm_entityTypes(&$entityTypes) {
- $entityTypes = array_merge($entityTypes, []);
-}
diff --git a/ext/legacycustomsearches/legacycustomsearches.php b/ext/legacycustomsearches/legacycustomsearches.php
index 92c9aa328a..9d16959ce5 100644
--- a/ext/legacycustomsearches/legacycustomsearches.php
+++ b/ext/legacycustomsearches/legacycustomsearches.php
@@ -23,24 +23,6 @@ function legacycustomsearches_civicrm_install() {
_legacycustomsearches_civix_civicrm_install();
}
-/**
- * Implements hook_civicrm_postInstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
- */
-function legacycustomsearches_civicrm_postInstall() {
- _legacycustomsearches_civix_civicrm_postInstall();
-}
-
-/**
- * Implements hook_civicrm_uninstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
- */
-function legacycustomsearches_civicrm_uninstall() {
- _legacycustomsearches_civix_civicrm_uninstall();
-}
-
/**
* Implements hook_civicrm_enable().
*
@@ -49,32 +31,3 @@ function legacycustomsearches_civicrm_uninstall() {
function legacycustomsearches_civicrm_enable() {
_legacycustomsearches_civix_civicrm_enable();
}
-
-/**
- * Implements hook_civicrm_disable().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
- */
-function legacycustomsearches_civicrm_disable() {
- _legacycustomsearches_civix_civicrm_disable();
-}
-
-/**
- * Implements hook_civicrm_upgrade().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
- */
-function legacycustomsearches_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
- return _legacycustomsearches_civix_civicrm_upgrade($op, $queue);
-}
-
-/**
- * Implements hook_civicrm_entityTypes().
- *
- * Declare entity types provided by this module.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
- */
-function legacycustomsearches_civicrm_entityTypes(&$entityTypes) {
- _legacycustomsearches_civix_civicrm_entityTypes($entityTypes);
-}
--
2.25.1