From fb1ccb6417fa57cc6d8f69c511f7a2ba38cd2f73 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 17 Jan 2023 10:08:28 +1300 Subject: [PATCH] Run civix upgrade on oauth --- ext/oauth-client/CRM/OAuth/Upgrader.php | 2 +- ext/oauth-client/CRM/OAuth/Upgrader/Base.php | 7 -- ext/oauth-client/info.xml | 2 +- ext/oauth-client/oauth_client.civix.php | 100 ++----------------- 4 files changed, 10 insertions(+), 101 deletions(-) delete mode 100644 ext/oauth-client/CRM/OAuth/Upgrader/Base.php diff --git a/ext/oauth-client/CRM/OAuth/Upgrader.php b/ext/oauth-client/CRM/OAuth/Upgrader.php index df5fdd0eb5..d196fd8ee6 100644 --- a/ext/oauth-client/CRM/OAuth/Upgrader.php +++ b/ext/oauth-client/CRM/OAuth/Upgrader.php @@ -4,7 +4,7 @@ use CRM_OAuth_ExtensionUtil as E; /** * Collection of upgrade steps. */ -class CRM_OAuth_Upgrader extends CRM_OAuth_Upgrader_Base { +class CRM_OAuth_Upgrader extends CRM_Extension_Upgrader_Base { /** * @see CRM_Utils_Hook::install() diff --git a/ext/oauth-client/CRM/OAuth/Upgrader/Base.php b/ext/oauth-client/CRM/OAuth/Upgrader/Base.php deleted file mode 100644 index ae97dcb733..0000000000 --- a/ext/oauth-client/CRM/OAuth/Upgrader/Base.php +++ /dev/null @@ -1,7 +0,0 @@ - CRM/OAuth - 22.10.0 + 22.12.1 diff --git a/ext/oauth-client/oauth_client.civix.php b/ext/oauth-client/oauth_client.civix.php index 3d9ae5d3f5..91cdf5cfa0 100644 --- a/ext/oauth-client/oauth_client.civix.php +++ b/ext/oauth-client/oauth_client.civix.php @@ -24,7 +24,7 @@ class CRM_OAuth_ExtensionUtil { * Translated text. * @see ts */ - public static function ts($text, $params = []) { + public static function ts($text, $params = []): string { if (!array_key_exists('domain', $params)) { $params['domain'] = [self::LONG_NAME, NULL]; } @@ -41,7 +41,7 @@ class CRM_OAuth_ExtensionUtil { * Ex: 'http://example.org/sites/default/ext/org.example.foo'. * Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'. */ - public static function url($file = NULL) { + public static function url($file = NULL): string { if ($file === NULL) { return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/'); } @@ -84,27 +84,20 @@ use CRM_OAuth_ExtensionUtil as E; * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config */ -function _oauth_client_civix_civicrm_config(&$config = NULL) { +function _oauth_client_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 , this does not currently require mixin/polyfill.php. } /** @@ -114,35 +107,7 @@ function _oauth_client_civix_civicrm_config(&$config = NULL) { */ function _oauth_client_civix_civicrm_install() { _oauth_client_civix_civicrm_config(); - if ($upgrader = _oauth_client_civix_upgrader()) { - $upgrader->onInstall(); - } -} - -/** - * Implements hook_civicrm_postInstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall - */ -function _oauth_client_civix_civicrm_postInstall() { - _oauth_client_civix_civicrm_config(); - if ($upgrader = _oauth_client_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 _oauth_client_civix_civicrm_uninstall() { - _oauth_client_civix_civicrm_config(); - if ($upgrader = _oauth_client_civix_upgrader()) { - $upgrader->onUninstall(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** @@ -150,58 +115,9 @@ function _oauth_client_civix_civicrm_uninstall() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable */ -function _oauth_client_civix_civicrm_enable() { - _oauth_client_civix_civicrm_config(); - if ($upgrader = _oauth_client_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 _oauth_client_civix_civicrm_disable() { +function _oauth_client_civix_civicrm_enable(): void { _oauth_client_civix_civicrm_config(); - if ($upgrader = _oauth_client_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 _oauth_client_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - if ($upgrader = _oauth_client_civix_upgrader()) { - return $upgrader->onUpgrade($op, $queue); - } -} - -/** - * @return CRM_OAuth_Upgrader - */ -function _oauth_client_civix_upgrader() { - if (!file_exists(__DIR__ . '/CRM/OAuth/Upgrader.php')) { - return NULL; - } - else { - return CRM_OAuth_Upgrader_Base::instance(); - } + // Based on , this does not currently require mixin/polyfill.php. } /** -- 2.25.1