From 0e39f355cf1c373086c2326fa777c11f5d943f36 Mon Sep 17 00:00:00 2001 From: colemanw Date: Mon, 25 Sep 2023 22:05:50 -0400 Subject: [PATCH] Upgrade all core extensions to civix 23.02.1 --- ext/authx/authx.civix.php | 4 +- ext/authx/info.xml | 2 +- ext/civiimport/civiimport.civix.php | 4 +- ext/civiimport/info.xml | 4 +- ext/ckeditor4/ckeditor4.civix.php | 4 +- ext/ckeditor4/info.xml | 4 +- .../contributioncancelactions.civix.php | 110 +----------------- ext/contributioncancelactions/info.xml | 2 +- ext/elavon/elavon.civix.php | 110 +----------------- ext/elavon/elavon.php | 47 -------- ext/elavon/info.xml | 2 +- ext/eventcart/eventcart.civix.php | 20 +--- ext/eventcart/eventcart.php | 11 -- ext/eventcart/info.xml | 3 +- ext/ewaysingle/ewaysingle.civix.php | 110 +----------------- ext/ewaysingle/ewaysingle.php | 47 -------- ext/ewaysingle/info.xml | 2 +- ext/financialacls/financialacls.civix.php | 4 +- ext/financialacls/info.xml | 2 +- ext/flexmailer/flexmailer.civix.php | 4 +- ext/flexmailer/info.xml | 3 +- ext/greenwich/greenwich.civix.php | 4 +- ext/greenwich/info.xml | 2 +- ext/legacycustomsearches/info.xml | 4 +- .../legacycustomsearches.civix.php | 4 +- ext/message_admin/info.xml | 4 +- ext/message_admin/message_admin.civix.php | 4 +- ext/oauth-client/info.xml | 4 +- ext/oauth-client/oauth_client.civix.php | 4 +- ext/payflowpro/info.xml | 2 +- ext/payflowpro/payflowpro.civix.php | 110 +----------------- ext/payflowpro/payflowpro.php | 47 -------- ext/recaptcha/info.xml | 4 +- ext/recaptcha/recaptcha.civix.php | 4 +- ext/search_kit/info.xml | 4 +- ext/search_kit/search_kit.civix.php | 4 +- ext/sequentialcreditnotes/info.xml | 5 +- .../sequentialcreditnotes.civix.php | 4 +- 38 files changed, 79 insertions(+), 634 deletions(-) diff --git a/ext/authx/authx.civix.php b/ext/authx/authx.civix.php index 4e1b32a58e..4bfa920f3a 100644 --- a/ext/authx/authx.civix.php +++ b/ext/authx/authx.civix.php @@ -133,8 +133,8 @@ function _authx_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/authx/info.xml b/ext/authx/info.xml index 757af71474..707bacf717 100644 --- a/ext/authx/info.xml +++ b/ext/authx/info.xml @@ -35,6 +35,6 @@ CRM/Authx - 23.02.0 + 23.02.1 diff --git a/ext/civiimport/civiimport.civix.php b/ext/civiimport/civiimport.civix.php index c912ca5bcf..7e45e4530a 100644 --- a/ext/civiimport/civiimport.civix.php +++ b/ext/civiimport/civiimport.civix.php @@ -133,8 +133,8 @@ function _civiimport_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/civiimport/info.xml b/ext/civiimport/info.xml index 2e9d47ad07..2e7cba3dff 100644 --- a/ext/civiimport/info.xml +++ b/ext/civiimport/info.xml @@ -31,7 +31,7 @@ CRM/Civiimport - 23.02.0 + 23.02.1 crmCiviimport @@ -39,6 +39,6 @@ scan-classes@1.0.0 setting-php@1.0.0 ang-php@1.0.0 - smarty-v2@1.0.0 + smarty-v2@1.0.1 diff --git a/ext/ckeditor4/ckeditor4.civix.php b/ext/ckeditor4/ckeditor4.civix.php index 39aa238b67..8465f04a1d 100644 --- a/ext/ckeditor4/ckeditor4.civix.php +++ b/ext/ckeditor4/ckeditor4.civix.php @@ -133,8 +133,8 @@ function _ckeditor4_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/ckeditor4/info.xml b/ext/ckeditor4/info.xml index a308624584..8dfd98035a 100644 --- a/ext/ckeditor4/info.xml +++ b/ext/ckeditor4/info.xml @@ -27,11 +27,11 @@ menu-xml@1.0.0 - smarty-v2@1.0.0 + smarty-v2@1.0.1 CRM/Ckeditor4 - 23.02.0 + 23.02.1 CRM_Ckeditor4_Upgrader diff --git a/ext/contributioncancelactions/contributioncancelactions.civix.php b/ext/contributioncancelactions/contributioncancelactions.civix.php index f78d349348..fa52d8fda4 100644 --- a/ext/contributioncancelactions/contributioncancelactions.civix.php +++ b/ext/contributioncancelactions/contributioncancelactions.civix.php @@ -84,27 +84,17 @@ use CRM_Contributioncancelactions_ExtensionUtil as E; * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config */ -function _contributioncancelactions_civix_civicrm_config(&$config = NULL) { +function _contributioncancelactions_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 , this does not currently require mixin/polyfill.php. } /** @@ -114,35 +104,7 @@ function _contributioncancelactions_civix_civicrm_config(&$config = NULL) { */ function _contributioncancelactions_civix_civicrm_install() { _contributioncancelactions_civix_civicrm_config(); - if ($upgrader = _contributioncancelactions_civix_upgrader()) { - $upgrader->onInstall(); - } -} - -/** - * Implements hook_civicrm_postInstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall - */ -function _contributioncancelactions_civix_civicrm_postInstall() { - _contributioncancelactions_civix_civicrm_config(); - if ($upgrader = _contributioncancelactions_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 _contributioncancelactions_civix_civicrm_uninstall(): void { - _contributioncancelactions_civix_civicrm_config(); - if ($upgrader = _contributioncancelactions_civix_upgrader()) { - $upgrader->onUninstall(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** @@ -152,56 +114,7 @@ function _contributioncancelactions_civix_civicrm_uninstall(): void { */ function _contributioncancelactions_civix_civicrm_enable(): void { _contributioncancelactions_civix_civicrm_config(); - if ($upgrader = _contributioncancelactions_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 _contributioncancelactions_civix_civicrm_disable(): void { - _contributioncancelactions_civix_civicrm_config(); - if ($upgrader = _contributioncancelactions_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 _contributioncancelactions_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - if ($upgrader = _contributioncancelactions_civix_upgrader()) { - return $upgrader->onUpgrade($op, $queue); - } -} - -/** - * @return CRM_Contributioncancelactions_Upgrader - */ -function _contributioncancelactions_civix_upgrader() { - if (!file_exists(__DIR__ . '/CRM/Contributioncancelactions/Upgrader.php')) { - return NULL; - } - else { - return CRM_Contributioncancelactions_Upgrader_Base::instance(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** @@ -220,8 +133,8 @@ function _contributioncancelactions_civix_insert_navigation_menu(&$menu, $path, if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; @@ -285,14 +198,3 @@ function _contributioncancelactions_civix_fixNavigationMenuItems(&$nodes, &$maxN } } } - -/** - * (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 _contributioncancelactions_civix_civicrm_entityTypes(&$entityTypes) { - $entityTypes = array_merge($entityTypes, []); -} diff --git a/ext/contributioncancelactions/info.xml b/ext/contributioncancelactions/info.xml index 0cb51b5df3..42f16e815f 100644 --- a/ext/contributioncancelactions/info.xml +++ b/ext/contributioncancelactions/info.xml @@ -27,6 +27,6 @@ CRM/Contributioncancelactions - 22.10.0 + 23.02.1 diff --git a/ext/elavon/elavon.civix.php b/ext/elavon/elavon.civix.php index 22f149e029..e26bb291b8 100644 --- a/ext/elavon/elavon.civix.php +++ b/ext/elavon/elavon.civix.php @@ -84,27 +84,17 @@ use CRM_Elavon_ExtensionUtil as E; * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config */ -function _elavon_civix_civicrm_config(&$config = NULL) { +function _elavon_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 , this does not currently require mixin/polyfill.php. } /** @@ -114,35 +104,7 @@ function _elavon_civix_civicrm_config(&$config = NULL) { */ function _elavon_civix_civicrm_install() { _elavon_civix_civicrm_config(); - if ($upgrader = _elavon_civix_upgrader()) { - $upgrader->onInstall(); - } -} - -/** - * Implements hook_civicrm_postInstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall - */ -function _elavon_civix_civicrm_postInstall() { - _elavon_civix_civicrm_config(); - if ($upgrader = _elavon_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 _elavon_civix_civicrm_uninstall(): void { - _elavon_civix_civicrm_config(); - if ($upgrader = _elavon_civix_upgrader()) { - $upgrader->onUninstall(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** @@ -152,56 +114,7 @@ function _elavon_civix_civicrm_uninstall(): void { */ function _elavon_civix_civicrm_enable(): void { _elavon_civix_civicrm_config(); - if ($upgrader = _elavon_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 _elavon_civix_civicrm_disable(): void { - _elavon_civix_civicrm_config(); - if ($upgrader = _elavon_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 _elavon_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - if ($upgrader = _elavon_civix_upgrader()) { - return $upgrader->onUpgrade($op, $queue); - } -} - -/** - * @return CRM_Elavon_Upgrader - */ -function _elavon_civix_upgrader() { - if (!file_exists(__DIR__ . '/CRM/Elavon/Upgrader.php')) { - return NULL; - } - else { - return CRM_Elavon_Upgrader_Base::instance(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** @@ -220,8 +133,8 @@ function _elavon_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; @@ -285,14 +198,3 @@ function _elavon_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) { } } } - -/** - * (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 _elavon_civix_civicrm_entityTypes(&$entityTypes) { - $entityTypes = array_merge($entityTypes, []); -} diff --git a/ext/elavon/elavon.php b/ext/elavon/elavon.php index 7bd31d2110..f3f6556fa4 100644 --- a/ext/elavon/elavon.php +++ b/ext/elavon/elavon.php @@ -23,24 +23,6 @@ function elavon_civicrm_install() { _elavon_civix_civicrm_install(); } -/** - * Implements hook_civicrm_postInstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall - */ -function elavon_civicrm_postInstall() { - _elavon_civix_civicrm_postInstall(); -} - -/** - * Implements hook_civicrm_uninstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall - */ -function elavon_civicrm_uninstall() { - _elavon_civix_civicrm_uninstall(); -} - /** * Implements hook_civicrm_enable(). * @@ -49,32 +31,3 @@ function elavon_civicrm_uninstall() { function elavon_civicrm_enable() { _elavon_civix_civicrm_enable(); } - -/** - * Implements hook_civicrm_disable(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable - */ -function elavon_civicrm_disable() { - _elavon_civix_civicrm_disable(); -} - -/** - * Implements hook_civicrm_upgrade(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade - */ -function elavon_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - return _elavon_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 elavon_civicrm_entityTypes(&$entityTypes) { - _elavon_civix_civicrm_entityTypes($entityTypes); -} diff --git a/ext/elavon/info.xml b/ext/elavon/info.xml index c167aa9e0f..877748f952 100644 --- a/ext/elavon/info.xml +++ b/ext/elavon/info.xml @@ -27,7 +27,7 @@ CRM/Elavon - 22.10.0 + 23.02.1 crmElavon diff --git a/ext/eventcart/eventcart.civix.php b/ext/eventcart/eventcart.civix.php index 91bd958e3b..930d1acbd5 100644 --- a/ext/eventcart/eventcart.civix.php +++ b/ext/eventcart/eventcart.civix.php @@ -92,11 +92,6 @@ function _eventcart_civix_civicrm_config($config = NULL) { $configured = TRUE; $extRoot = __DIR__ . DIRECTORY_SEPARATOR; - $extDir = $extRoot . 'templates'; - if (file_exists($extDir)) { - CRM_Core_Smarty::singleton()->addTemplateDir($extDir); - } - $include_path = $extRoot . PATH_SEPARATOR . get_include_path(); set_include_path($include_path); // Based on , this does not currently require mixin/polyfill.php. @@ -138,8 +133,8 @@ function _eventcart_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; @@ -203,14 +198,3 @@ function _eventcart_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) } } } - -/** - * (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 _eventcart_civix_civicrm_entityTypes(&$entityTypes) { - $entityTypes = array_merge($entityTypes, []); -} diff --git a/ext/eventcart/eventcart.php b/ext/eventcart/eventcart.php index 771659a4c2..3fb283d20f 100644 --- a/ext/eventcart/eventcart.php +++ b/ext/eventcart/eventcart.php @@ -52,17 +52,6 @@ function eventcart_civicrm_enable() { _eventcart_civix_civicrm_enable(); } -/** - * Implements hook_civicrm_entityTypes(). - * - * Declare entity types provided by this module. - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes - */ -function eventcart_civicrm_entityTypes(&$entityTypes) { - _eventcart_civix_civicrm_entityTypes($entityTypes); -} - function eventcart_civicrm_tabset($name, &$tabs) { if ($name === 'civicrm/event/manage' && Civi::settings()->get('enable_cart')) { $tabs['conference'] = [ diff --git a/ext/eventcart/info.xml b/ext/eventcart/info.xml index 131924abe7..37ef3acd71 100644 --- a/ext/eventcart/info.xml +++ b/ext/eventcart/info.xml @@ -28,9 +28,10 @@ menu-xml@1.0.0 setting-php@1.0.0 + smarty-v2@1.0.1 CRM/Event/Cart - 22.12.1 + 23.02.1 diff --git a/ext/ewaysingle/ewaysingle.civix.php b/ext/ewaysingle/ewaysingle.civix.php index 33da147685..c161575f74 100644 --- a/ext/ewaysingle/ewaysingle.civix.php +++ b/ext/ewaysingle/ewaysingle.civix.php @@ -84,27 +84,17 @@ use CRM_Ewaysingle_ExtensionUtil as E; * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config */ -function _ewaysingle_civix_civicrm_config(&$config = NULL) { +function _ewaysingle_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 , this does not currently require mixin/polyfill.php. } /** @@ -114,35 +104,7 @@ function _ewaysingle_civix_civicrm_config(&$config = NULL) { */ function _ewaysingle_civix_civicrm_install() { _ewaysingle_civix_civicrm_config(); - if ($upgrader = _ewaysingle_civix_upgrader()) { - $upgrader->onInstall(); - } -} - -/** - * Implements hook_civicrm_postInstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall - */ -function _ewaysingle_civix_civicrm_postInstall() { - _ewaysingle_civix_civicrm_config(); - if ($upgrader = _ewaysingle_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 _ewaysingle_civix_civicrm_uninstall(): void { - _ewaysingle_civix_civicrm_config(); - if ($upgrader = _ewaysingle_civix_upgrader()) { - $upgrader->onUninstall(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** @@ -152,56 +114,7 @@ function _ewaysingle_civix_civicrm_uninstall(): void { */ function _ewaysingle_civix_civicrm_enable(): void { _ewaysingle_civix_civicrm_config(); - if ($upgrader = _ewaysingle_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 _ewaysingle_civix_civicrm_disable(): void { - _ewaysingle_civix_civicrm_config(); - if ($upgrader = _ewaysingle_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 _ewaysingle_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - if ($upgrader = _ewaysingle_civix_upgrader()) { - return $upgrader->onUpgrade($op, $queue); - } -} - -/** - * @return CRM_Ewaysingle_Upgrader - */ -function _ewaysingle_civix_upgrader() { - if (!file_exists(__DIR__ . '/CRM/Ewaysingle/Upgrader.php')) { - return NULL; - } - else { - return CRM_Ewaysingle_Upgrader_Base::instance(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** @@ -220,8 +133,8 @@ function _ewaysingle_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; @@ -285,14 +198,3 @@ function _ewaysingle_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID } } } - -/** - * (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 _ewaysingle_civix_civicrm_entityTypes(&$entityTypes) { - $entityTypes = array_merge($entityTypes, []); -} diff --git a/ext/ewaysingle/ewaysingle.php b/ext/ewaysingle/ewaysingle.php index 9c146e341b..1f4441ea8f 100644 --- a/ext/ewaysingle/ewaysingle.php +++ b/ext/ewaysingle/ewaysingle.php @@ -23,24 +23,6 @@ function ewaysingle_civicrm_install() { _ewaysingle_civix_civicrm_install(); } -/** - * Implements hook_civicrm_postInstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall - */ -function ewaysingle_civicrm_postInstall() { - _ewaysingle_civix_civicrm_postInstall(); -} - -/** - * Implements hook_civicrm_uninstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall - */ -function ewaysingle_civicrm_uninstall() { - _ewaysingle_civix_civicrm_uninstall(); -} - /** * Implements hook_civicrm_enable(). * @@ -49,32 +31,3 @@ function ewaysingle_civicrm_uninstall() { function ewaysingle_civicrm_enable() { _ewaysingle_civix_civicrm_enable(); } - -/** - * Implements hook_civicrm_disable(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable - */ -function ewaysingle_civicrm_disable() { - _ewaysingle_civix_civicrm_disable(); -} - -/** - * Implements hook_civicrm_upgrade(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade - */ -function ewaysingle_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - return _ewaysingle_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 ewaysingle_civicrm_entityTypes(&$entityTypes) { - _ewaysingle_civix_civicrm_entityTypes($entityTypes); -} diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml index 402b4de17c..9bab59ab84 100644 --- a/ext/ewaysingle/info.xml +++ b/ext/ewaysingle/info.xml @@ -33,6 +33,6 @@ CRM/Ewaysingle - 22.10.0 + 23.02.1 diff --git a/ext/financialacls/financialacls.civix.php b/ext/financialacls/financialacls.civix.php index d7b20fa37a..430305c553 100644 --- a/ext/financialacls/financialacls.civix.php +++ b/ext/financialacls/financialacls.civix.php @@ -133,8 +133,8 @@ function _financialacls_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/financialacls/info.xml b/ext/financialacls/info.xml index a0554914e0..df233bed88 100644 --- a/ext/financialacls/info.xml +++ b/ext/financialacls/info.xml @@ -33,6 +33,6 @@ CRM/Financialacls - 23.02.0 + 23.02.1 diff --git a/ext/flexmailer/flexmailer.civix.php b/ext/flexmailer/flexmailer.civix.php index 2905f48988..273986155d 100644 --- a/ext/flexmailer/flexmailer.civix.php +++ b/ext/flexmailer/flexmailer.civix.php @@ -133,8 +133,8 @@ function _flexmailer_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/flexmailer/info.xml b/ext/flexmailer/info.xml index 1996698023..0e0f4608aa 100644 --- a/ext/flexmailer/info.xml +++ b/ext/flexmailer/info.xml @@ -30,6 +30,7 @@ + menu-xml@1.0.0 @@ -37,6 +38,6 @@ CRM/Flexmailer - 23.02.0 + 23.02.1 diff --git a/ext/greenwich/greenwich.civix.php b/ext/greenwich/greenwich.civix.php index 2c4dfb1309..97bf46e4ea 100644 --- a/ext/greenwich/greenwich.civix.php +++ b/ext/greenwich/greenwich.civix.php @@ -133,8 +133,8 @@ function _greenwich_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml index 6064f06d24..07d4baa490 100644 --- a/ext/greenwich/info.xml +++ b/ext/greenwich/info.xml @@ -29,6 +29,6 @@ CRM/Greenwich - 23.02.0 + 23.02.1 diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml index 171c3c3c8f..a596b5d194 100644 --- a/ext/legacycustomsearches/info.xml +++ b/ext/legacycustomsearches/info.xml @@ -28,11 +28,11 @@ menu-xml@1.0.0 mgd-php@1.0.0 - smarty-v2@1.0.0 + smarty-v2@1.0.1 setting-php@1.0.0 CRM/Legacycustomsearches - 23.02.0 + 23.02.1 diff --git a/ext/legacycustomsearches/legacycustomsearches.civix.php b/ext/legacycustomsearches/legacycustomsearches.civix.php index ffcb4eeb94..ac3bca24f3 100644 --- a/ext/legacycustomsearches/legacycustomsearches.civix.php +++ b/ext/legacycustomsearches/legacycustomsearches.civix.php @@ -133,8 +133,8 @@ function _legacycustomsearches_civix_insert_navigation_menu(&$menu, $path, $item if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml index 3afb75e2c6..fb9e021a7d 100644 --- a/ext/message_admin/info.xml +++ b/ext/message_admin/info.xml @@ -31,10 +31,10 @@ ang-php@1.0.0 menu-xml@1.0.0 - smarty-v2@1.0.0 + smarty-v2@1.0.1 CRM/MessageAdmin - 23.02.0 + 23.02.1 diff --git a/ext/message_admin/message_admin.civix.php b/ext/message_admin/message_admin.civix.php index 78da356905..432521c56e 100644 --- a/ext/message_admin/message_admin.civix.php +++ b/ext/message_admin/message_admin.civix.php @@ -133,8 +133,8 @@ function _message_admin_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml index 7c3666f0d9..7c90d47241 100644 --- a/ext/oauth-client/info.xml +++ b/ext/oauth-client/info.xml @@ -33,11 +33,11 @@ ang-php@1.0.0 menu-xml@1.0.0 setting-php@1.0.0 - smarty-v2@1.0.0 + smarty-v2@1.0.1 entity-types-php@1.0.0 CRM/OAuth - 23.02.0 + 23.02.1 diff --git a/ext/oauth-client/oauth_client.civix.php b/ext/oauth-client/oauth_client.civix.php index bf8cc5fd0a..3134514b44 100644 --- a/ext/oauth-client/oauth_client.civix.php +++ b/ext/oauth-client/oauth_client.civix.php @@ -133,8 +133,8 @@ function _oauth_client_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml index bf111f4c2b..603bde52b4 100644 --- a/ext/payflowpro/info.xml +++ b/ext/payflowpro/info.xml @@ -30,6 +30,6 @@ CRM/Payflowpro - 22.10.0 + 23.02.1 diff --git a/ext/payflowpro/payflowpro.civix.php b/ext/payflowpro/payflowpro.civix.php index ff6316d715..a233c68624 100644 --- a/ext/payflowpro/payflowpro.civix.php +++ b/ext/payflowpro/payflowpro.civix.php @@ -84,27 +84,17 @@ use CRM_Payflowpro_ExtensionUtil as E; * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config */ -function _payflowpro_civix_civicrm_config(&$config = NULL) { +function _payflowpro_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 , this does not currently require mixin/polyfill.php. } /** @@ -114,35 +104,7 @@ function _payflowpro_civix_civicrm_config(&$config = NULL) { */ function _payflowpro_civix_civicrm_install() { _payflowpro_civix_civicrm_config(); - if ($upgrader = _payflowpro_civix_upgrader()) { - $upgrader->onInstall(); - } -} - -/** - * Implements hook_civicrm_postInstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall - */ -function _payflowpro_civix_civicrm_postInstall() { - _payflowpro_civix_civicrm_config(); - if ($upgrader = _payflowpro_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 _payflowpro_civix_civicrm_uninstall(): void { - _payflowpro_civix_civicrm_config(); - if ($upgrader = _payflowpro_civix_upgrader()) { - $upgrader->onUninstall(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** @@ -152,56 +114,7 @@ function _payflowpro_civix_civicrm_uninstall(): void { */ function _payflowpro_civix_civicrm_enable(): void { _payflowpro_civix_civicrm_config(); - if ($upgrader = _payflowpro_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 _payflowpro_civix_civicrm_disable(): void { - _payflowpro_civix_civicrm_config(); - if ($upgrader = _payflowpro_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 _payflowpro_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - if ($upgrader = _payflowpro_civix_upgrader()) { - return $upgrader->onUpgrade($op, $queue); - } -} - -/** - * @return CRM_Payflowpro_Upgrader - */ -function _payflowpro_civix_upgrader() { - if (!file_exists(__DIR__ . '/CRM/Payflowpro/Upgrader.php')) { - return NULL; - } - else { - return CRM_Payflowpro_Upgrader_Base::instance(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** @@ -220,8 +133,8 @@ function _payflowpro_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; @@ -285,14 +198,3 @@ function _payflowpro_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID } } } - -/** - * (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 _payflowpro_civix_civicrm_entityTypes(&$entityTypes) { - $entityTypes = array_merge($entityTypes, []); -} diff --git a/ext/payflowpro/payflowpro.php b/ext/payflowpro/payflowpro.php index 3479e41c73..7a30241d23 100644 --- a/ext/payflowpro/payflowpro.php +++ b/ext/payflowpro/payflowpro.php @@ -23,24 +23,6 @@ function payflowpro_civicrm_install() { _payflowpro_civix_civicrm_install(); } -/** - * Implements hook_civicrm_postInstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall - */ -function payflowpro_civicrm_postInstall() { - _payflowpro_civix_civicrm_postInstall(); -} - -/** - * Implements hook_civicrm_uninstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall - */ -function payflowpro_civicrm_uninstall() { - _payflowpro_civix_civicrm_uninstall(); -} - /** * Implements hook_civicrm_enable(). * @@ -49,32 +31,3 @@ function payflowpro_civicrm_uninstall() { function payflowpro_civicrm_enable() { _payflowpro_civix_civicrm_enable(); } - -/** - * Implements hook_civicrm_disable(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable - */ -function payflowpro_civicrm_disable() { - _payflowpro_civix_civicrm_disable(); -} - -/** - * Implements hook_civicrm_upgrade(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade - */ -function payflowpro_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - return _payflowpro_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 payflowpro_civicrm_entityTypes(&$entityTypes) { - _payflowpro_civix_civicrm_entityTypes($entityTypes); -} diff --git a/ext/recaptcha/info.xml b/ext/recaptcha/info.xml index 5c67f330d6..ba2cc58ea3 100644 --- a/ext/recaptcha/info.xml +++ b/ext/recaptcha/info.xml @@ -30,10 +30,10 @@ setting-php@1.0.0 ang-php@1.0.0 scan-classes@1.0.0 - smarty-v2@1.0.0 + smarty-v2@1.0.1 CRM/Recaptcha - 23.02.0 + 23.02.1 diff --git a/ext/recaptcha/recaptcha.civix.php b/ext/recaptcha/recaptcha.civix.php index 13f0af1218..6c1d618f1e 100644 --- a/ext/recaptcha/recaptcha.civix.php +++ b/ext/recaptcha/recaptcha.civix.php @@ -133,8 +133,8 @@ function _recaptcha_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml index 7415e5f19b..2face1e982 100644 --- a/ext/search_kit/info.xml +++ b/ext/search_kit/info.xml @@ -35,10 +35,10 @@ menu-xml@1.0.0 mgd-php@1.0.0 entity-types-php@1.0.0 - smarty-v2@1.0.0 + smarty-v2@1.0.1 CRM/Search - 23.02.0 + 23.02.1 diff --git a/ext/search_kit/search_kit.civix.php b/ext/search_kit/search_kit.civix.php index a0be0f9032..8771431147 100644 --- a/ext/search_kit/search_kit.civix.php +++ b/ext/search_kit/search_kit.civix.php @@ -133,8 +133,8 @@ function _search_kit_civix_insert_navigation_menu(&$menu, $path, $item) { if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; diff --git a/ext/sequentialcreditnotes/info.xml b/ext/sequentialcreditnotes/info.xml index 5adb4899b3..bf288416bf 100644 --- a/ext/sequentialcreditnotes/info.xml +++ b/ext/sequentialcreditnotes/info.xml @@ -28,6 +28,9 @@ CRM/Sequentialcreditnotes - 23.02.0 + 23.02.1 + + + diff --git a/ext/sequentialcreditnotes/sequentialcreditnotes.civix.php b/ext/sequentialcreditnotes/sequentialcreditnotes.civix.php index 4b35c35b76..429615a028 100644 --- a/ext/sequentialcreditnotes/sequentialcreditnotes.civix.php +++ b/ext/sequentialcreditnotes/sequentialcreditnotes.civix.php @@ -133,8 +133,8 @@ function _sequentialcreditnotes_civix_insert_navigation_menu(&$menu, $path, $ite if (empty($path)) { $menu[] = [ 'attributes' => array_merge([ - 'label' => CRM_Utils_Array::value('name', $item), - 'active' => 1, + 'label' => $item['name'] ?? NULL, + 'active' => 1, ], $item), ]; return TRUE; -- 2.25.1