diff --git a/donortierreport.civix.php b/donortierreport.civix.php index f2e8460..79cc085 100644 --- a/donortierreport.civix.php +++ b/donortierreport.civix.php @@ -24,7 +24,7 @@ class CRM_Donortierreport_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 @@ public static function ts($text, $params = []) { * 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), '/'); } @@ -79,45 +79,29 @@ public static function findClass($suffix) { use CRM_Donortierreport_ExtensionUtil as E; +function _donortierreport_civix_mixin_polyfill() { + if (!class_exists('CRM_Extension_MixInfo')) { + $polyfill = __DIR__ . '/mixin/polyfill.php'; + (require $polyfill)(E::LONG_NAME, E::SHORT_NAME, E::path()); + } +} + /** * (Delegated) Implements hook_civicrm_config(). * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config */ -function _donortierreport_civix_civicrm_config(&$config = NULL) { +function _donortierreport_civix_civicrm_config($config = NULL) { static $configured = FALSE; if ($configured) { return; } $configured = TRUE; - $template =& CRM_Core_Smarty::singleton(); - - $extRoot = dirname(__FILE__) . 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]; - } - + $extRoot = __DIR__ . DIRECTORY_SEPARATOR; $include_path = $extRoot . PATH_SEPARATOR . get_include_path(); set_include_path($include_path); -} - -/** - * (Delegated) Implements hook_civicrm_xmlMenu(). - * - * @param $files array(string) - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu - */ -function _donortierreport_civix_civicrm_xmlMenu(&$files) { - foreach (_donortierreport_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) { - $files[] = $file; - } + _donortierreport_civix_mixin_polyfill(); } /** @@ -127,35 +111,7 @@ function _donortierreport_civix_civicrm_xmlMenu(&$files) { */ function _donortierreport_civix_civicrm_install() { _donortierreport_civix_civicrm_config(); - if ($upgrader = _donortierreport_civix_upgrader()) { - $upgrader->onInstall(); - } -} - -/** - * Implements hook_civicrm_postInstall(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall - */ -function _donortierreport_civix_civicrm_postInstall() { - _donortierreport_civix_civicrm_config(); - if ($upgrader = _donortierreport_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 _donortierreport_civix_civicrm_uninstall() { - _donortierreport_civix_civicrm_config(); - if ($upgrader = _donortierreport_civix_upgrader()) { - $upgrader->onUninstall(); - } + _donortierreport_civix_mixin_polyfill(); } /** @@ -163,212 +119,9 @@ function _donortierreport_civix_civicrm_uninstall() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable */ -function _donortierreport_civix_civicrm_enable() { - _donortierreport_civix_civicrm_config(); - if ($upgrader = _donortierreport_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 _donortierreport_civix_civicrm_disable() { +function _donortierreport_civix_civicrm_enable(): void { _donortierreport_civix_civicrm_config(); - if ($upgrader = _donortierreport_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 _donortierreport_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - if ($upgrader = _donortierreport_civix_upgrader()) { - return $upgrader->onUpgrade($op, $queue); - } -} - -/** - * @return CRM_Donortierreport_Upgrader - */ -function _donortierreport_civix_upgrader() { - if (!file_exists(__DIR__ . '/CRM/Donortierreport/Upgrader.php')) { - return NULL; - } - else { - return CRM_Donortierreport_Upgrader_Base::instance(); - } -} - -/** - * Search directory tree for files which match a glob pattern. - * - * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored. - * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles() - * - * @param string $dir base dir - * @param string $pattern , glob pattern, eg "*.txt" - * - * @return array - */ -function _donortierreport_civix_find_files($dir, $pattern) { - if (is_callable(['CRM_Utils_File', 'findFiles'])) { - return CRM_Utils_File::findFiles($dir, $pattern); - } - - $todos = [$dir]; - $result = []; - while (!empty($todos)) { - $subdir = array_shift($todos); - foreach (_donortierreport_civix_glob("$subdir/$pattern") as $match) { - if (!is_dir($match)) { - $result[] = $match; - } - } - if ($dh = opendir($subdir)) { - while (FALSE !== ($entry = readdir($dh))) { - $path = $subdir . DIRECTORY_SEPARATOR . $entry; - if ($entry[0] == '.') { - } - elseif (is_dir($path)) { - $todos[] = $path; - } - } - closedir($dh); - } - } - return $result; -} - -/** - * (Delegated) Implements hook_civicrm_managed(). - * - * Find any *.mgd.php files, merge their content, and return. - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed - */ -function _donortierreport_civix_civicrm_managed(&$entities) { - $mgdFiles = _donortierreport_civix_find_files(__DIR__, '*.mgd.php'); - sort($mgdFiles); - foreach ($mgdFiles as $file) { - $es = include $file; - foreach ($es as $e) { - if (empty($e['module'])) { - $e['module'] = E::LONG_NAME; - } - if (empty($e['params']['version'])) { - $e['params']['version'] = '3'; - } - $entities[] = $e; - } - } -} - -/** - * (Delegated) Implements hook_civicrm_caseTypes(). - * - * Find any and return any files matching "xml/case/*.xml" - * - * Note: This hook only runs in CiviCRM 4.4+. - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes - */ -function _donortierreport_civix_civicrm_caseTypes(&$caseTypes) { - if (!is_dir(__DIR__ . '/xml/case')) { - return; - } - - foreach (_donortierreport_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) { - $name = preg_replace('/\.xml$/', '', basename($file)); - if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) { - $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name)); - throw new CRM_Core_Exception($errorMessage); - } - $caseTypes[$name] = [ - 'module' => E::LONG_NAME, - 'name' => $name, - 'file' => $file, - ]; - } -} - -/** - * (Delegated) Implements hook_civicrm_angularModules(). - * - * Find any and return any files matching "ang/*.ang.php" - * - * Note: This hook only runs in CiviCRM 4.5+. - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules - */ -function _donortierreport_civix_civicrm_angularModules(&$angularModules) { - if (!is_dir(__DIR__ . '/ang')) { - return; - } - - $files = _donortierreport_civix_glob(__DIR__ . '/ang/*.ang.php'); - foreach ($files as $file) { - $name = preg_replace(':\.ang\.php$:', '', basename($file)); - $module = include $file; - if (empty($module['ext'])) { - $module['ext'] = E::LONG_NAME; - } - $angularModules[$name] = $module; - } -} - -/** - * (Delegated) Implements hook_civicrm_themes(). - * - * Find any and return any files matching "*.theme.php" - */ -function _donortierreport_civix_civicrm_themes(&$themes) { - $files = _donortierreport_civix_glob(__DIR__ . '/*.theme.php'); - foreach ($files as $file) { - $themeMeta = include $file; - if (empty($themeMeta['name'])) { - $themeMeta['name'] = preg_replace(':\.theme\.php$:', '', basename($file)); - } - if (empty($themeMeta['ext'])) { - $themeMeta['ext'] = E::LONG_NAME; - } - $themes[$themeMeta['name']] = $themeMeta; - } -} - -/** - * Glob wrapper which is guaranteed to return an array. - * - * The documentation for glob() says, "On some systems it is impossible to - * distinguish between empty match and an error." Anecdotally, the return - * result for an empty match is sometimes array() and sometimes FALSE. - * This wrapper provides consistency. - * - * @link http://php.net/glob - * @param string $pattern - * - * @return array - */ -function _donortierreport_civix_glob($pattern) { - $result = glob($pattern); - return is_array($result) ? $result : []; + _donortierreport_civix_mixin_polyfill(); } /** @@ -387,8 +140,8 @@ function _donortierreport_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; @@ -452,26 +205,3 @@ function _donortierreport_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $par } } } - -/** - * (Delegated) Implements hook_civicrm_alterSettingsFolders(). - * - * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders - */ -function _donortierreport_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { - $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings'; - if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) { - $metaDataFolders[] = $settingsDir; - } -} - -/** - * (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 _donortierreport_civix_civicrm_entityTypes(&$entityTypes) { - $entityTypes = array_merge($entityTypes, []); -} diff --git a/donortierreport.php b/donortierreport.php index 66a1917..5912112 100644 --- a/donortierreport.php +++ b/donortierreport.php @@ -11,17 +11,6 @@ function donortierreport_civicrm_config(&$config) { _donortierreport_civix_civicrm_config($config); } -/** - * Implementation of hook_civicrm_xmlMenu - * - * @param $files array(string) - * - * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu - */ -function donortierreport_civicrm_xmlMenu(&$files) { - _donortierreport_civix_civicrm_xmlMenu($files); -} - /** * Implementation of hook_civicrm_install * @@ -31,15 +20,6 @@ function donortierreport_civicrm_install() { _donortierreport_civix_civicrm_install(); } -/** - * Implementation of hook_civicrm_uninstall - * - * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall - */ -function donortierreport_civicrm_uninstall() { - _donortierreport_civix_civicrm_uninstall(); -} - /** * Implementation of hook_civicrm_enable * @@ -49,60 +29,11 @@ function donortierreport_civicrm_enable() { _donortierreport_civix_civicrm_enable(); } -/** - * Implementation of hook_civicrm_disable - * - * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable - */ -function donortierreport_civicrm_disable() { - _donortierreport_civix_civicrm_disable(); -} - -/** - * Implementation of 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 http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade - */ -function donortierreport_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - return _donortierreport_civix_civicrm_upgrade($op, $queue); -} - -/** - * Implementation of hook_civicrm_managed - * - * Generate a list of entities to create/deactivate/delete when this module - * is installed, disabled, uninstalled. - * - * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed - */ -function donortierreport_civicrm_managed(&$entities) { - _donortierreport_civix_civicrm_managed($entities); -} - -/** - * Implementation of hook_civicrm_caseTypes - * - * Generate a list of case-types - * - * Note: This hook only runs in CiviCRM 4.4+. - * - * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes - */ -function donortierreport_civicrm_caseTypes(&$caseTypes) { - _donortierreport_civix_civicrm_caseTypes($caseTypes); -} - -/** - * Implementation of hook_civicrm_alterSettingsFolders - * - * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders - */ -function donortierreport_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { - _donortierreport_civix_civicrm_alterSettingsFolders($metaDataFolders); -} +// /** +// * Implements hook_civicrm_postInstall(). +// * +// * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall +// */ +// function donortierreport_civicrm_postInstall() { +// _donortierreport_civix_civicrm_postInstall(); +// } diff --git a/info.xml b/info.xml index 366e85b..9be5661 100644 --- a/info.xml +++ b/info.xml @@ -14,16 +14,22 @@ https://aghstrategies.com/contact http://www.gnu.org/licenses/agpl-3.0.html - 2015-10-16 - 1.0 + 2024-09-10 + 1.1 stable - 4.6 - 4.7 - 5.3 - 5.8 + 5.27 CRM/Donortierreport + 23.02.1 + + mgd-php@1.0.0 + smarty-v2@1.0.1 + + + + +