From 4b1d1fd22b24cb444b6133c9bb0739f90a43f2b3 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Thu, 24 Sep 2020 14:33:56 +0100
Subject: [PATCH] Release 0.9.3
---
docs/releasenotes.md | 4 ++
info.xml | 4 +-
mjwshared.civix.php | 120 ++++++++++++++++++++++++-------------------
3 files changed, 74 insertions(+), 54 deletions(-)
diff --git a/docs/releasenotes.md b/docs/releasenotes.md
index 434b578..cbbb45a 100644
--- a/docs/releasenotes.md
+++ b/docs/releasenotes.md
@@ -9,6 +9,10 @@ Releases use the following numbering system:
* **[BC]**: Items marked with [BC] indicate a breaking change that will require updates to your code if you are using that code in your extension.
+## Releaes 0.9.3
+
+* Add `getBillingSubmit()` to CRM.payment.
+
## Release 0.9.2
* Load CRM.payment library via coreResourceList so it is added everywhere CiviCRM is loaded (eg. drupal_webform etc)
diff --git a/info.xml b/info.xml
index 6a7cf69..75f19bf 100644
--- a/info.xml
+++ b/info.xml
@@ -14,8 +14,8 @@
<url desc="Release Notes">https://lab.civicrm.org/extensions/mjwshared/-/blob/master/docs/releasenotes.md</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
- <releaseDate>2020-08-26</releaseDate>
- <version>0.9.2</version>
+ <releaseDate>2020-09-24</releaseDate>
+ <version>0.9.3</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.28</ver>
diff --git a/mjwshared.civix.php b/mjwshared.civix.php
index cb9ed4e..a99b654 100644
--- a/mjwshared.civix.php
+++ b/mjwshared.civix.php
@@ -24,9 +24,9 @@ class CRM_Mjwshared_ExtensionUtil {
* Translated text.
* @see ts
*/
- public static function ts($text, $params = array()) {
+ public static function ts($text, $params = []) {
if (!array_key_exists('domain', $params)) {
- $params['domain'] = array(self::LONG_NAME, NULL);
+ $params['domain'] = [self::LONG_NAME, NULL];
}
return ts($text, $params);
}
@@ -82,7 +82,7 @@ use CRM_Mjwshared_ExtensionUtil as E;
/**
* (Delegated) Implements hook_civicrm_config().
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
*/
function _mjwshared_civix_civicrm_config(&$config = NULL) {
static $configured = FALSE;
@@ -100,7 +100,7 @@ function _mjwshared_civix_civicrm_config(&$config = NULL) {
array_unshift($template->template_dir, $extDir);
}
else {
- $template->template_dir = array($extDir, $template->template_dir);
+ $template->template_dir = [$extDir, $template->template_dir];
}
$include_path = $extRoot . PATH_SEPARATOR . get_include_path();
@@ -112,7 +112,7 @@ function _mjwshared_civix_civicrm_config(&$config = NULL) {
*
* @param $files array(string)
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
*/
function _mjwshared_civix_civicrm_xmlMenu(&$files) {
foreach (_mjwshared_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
@@ -123,7 +123,7 @@ function _mjwshared_civix_civicrm_xmlMenu(&$files) {
/**
* Implements hook_civicrm_install().
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
*/
function _mjwshared_civix_civicrm_install() {
_mjwshared_civix_civicrm_config();
@@ -135,12 +135,12 @@ function _mjwshared_civix_civicrm_install() {
/**
* Implements hook_civicrm_postInstall().
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
*/
function _mjwshared_civix_civicrm_postInstall() {
_mjwshared_civix_civicrm_config();
if ($upgrader = _mjwshared_civix_upgrader()) {
- if (is_callable(array($upgrader, 'onPostInstall'))) {
+ if (is_callable([$upgrader, 'onPostInstall'])) {
$upgrader->onPostInstall();
}
}
@@ -149,7 +149,7 @@ function _mjwshared_civix_civicrm_postInstall() {
/**
* Implements hook_civicrm_uninstall().
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
*/
function _mjwshared_civix_civicrm_uninstall() {
_mjwshared_civix_civicrm_config();
@@ -161,12 +161,12 @@ function _mjwshared_civix_civicrm_uninstall() {
/**
* (Delegated) Implements hook_civicrm_enable().
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
*/
function _mjwshared_civix_civicrm_enable() {
_mjwshared_civix_civicrm_config();
if ($upgrader = _mjwshared_civix_upgrader()) {
- if (is_callable(array($upgrader, 'onEnable'))) {
+ if (is_callable([$upgrader, 'onEnable'])) {
$upgrader->onEnable();
}
}
@@ -175,13 +175,13 @@ function _mjwshared_civix_civicrm_enable() {
/**
* (Delegated) Implements hook_civicrm_disable().
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
* @return mixed
*/
function _mjwshared_civix_civicrm_disable() {
_mjwshared_civix_civicrm_config();
if ($upgrader = _mjwshared_civix_upgrader()) {
- if (is_callable(array($upgrader, 'onDisable'))) {
+ if (is_callable([$upgrader, 'onDisable'])) {
$upgrader->onDisable();
}
}
@@ -193,10 +193,11 @@ function _mjwshared_civix_civicrm_disable() {
* @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
+ * @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
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
*/
function _mjwshared_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
if ($upgrader = _mjwshared_civix_upgrader()) {
@@ -217,22 +218,23 @@ function _mjwshared_civix_upgrader() {
}
/**
- * Search directory tree for files which match a glob pattern
+ * 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 $dir string, base dir
- * @param $pattern string, glob pattern, eg "*.txt"
- * @return array(string)
+ * @param string $dir base dir
+ * @param string $pattern , glob pattern, eg "*.txt"
+ *
+ * @return array
*/
function _mjwshared_civix_find_files($dir, $pattern) {
- if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+ if (is_callable(['CRM_Utils_File', 'findFiles'])) {
return CRM_Utils_File::findFiles($dir, $pattern);
}
- $todos = array($dir);
- $result = array();
+ $todos = [$dir];
+ $result = [];
while (!empty($todos)) {
$subdir = array_shift($todos);
foreach (_mjwshared_civix_glob("$subdir/$pattern") as $match) {
@@ -243,7 +245,7 @@ function _mjwshared_civix_find_files($dir, $pattern) {
if ($dh = opendir($subdir)) {
while (FALSE !== ($entry = readdir($dh))) {
$path = $subdir . DIRECTORY_SEPARATOR . $entry;
- if ($entry{0} == '.') {
+ if ($entry[0] == '.') {
}
elseif (is_dir($path)) {
$todos[] = $path;
@@ -254,12 +256,13 @@ function _mjwshared_civix_find_files($dir, $pattern) {
}
return $result;
}
+
/**
* (Delegated) Implements hook_civicrm_managed().
*
* Find any *.mgd.php files, merge their content, and return.
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
*/
function _mjwshared_civix_civicrm_managed(&$entities) {
$mgdFiles = _mjwshared_civix_find_files(__DIR__, '*.mgd.php');
@@ -285,7 +288,7 @@ function _mjwshared_civix_civicrm_managed(&$entities) {
*
* Note: This hook only runs in CiviCRM 4.4+.
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
*/
function _mjwshared_civix_civicrm_caseTypes(&$caseTypes) {
if (!is_dir(__DIR__ . '/xml/case')) {
@@ -296,14 +299,13 @@ function _mjwshared_civix_civicrm_caseTypes(&$caseTypes) {
$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));
- CRM_Core_Error::fatal($errorMessage);
- // throw new CRM_Core_Exception($errorMessage);
+ throw new CRM_Core_Exception($errorMessage);
}
- $caseTypes[$name] = array(
+ $caseTypes[$name] = [
'module' => E::LONG_NAME,
'name' => $name,
'file' => $file,
- );
+ ];
}
}
@@ -314,7 +316,7 @@ function _mjwshared_civix_civicrm_caseTypes(&$caseTypes) {
*
* Note: This hook only runs in CiviCRM 4.5+.
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
*/
function _mjwshared_civix_civicrm_angularModules(&$angularModules) {
if (!is_dir(__DIR__ . '/ang')) {
@@ -332,6 +334,25 @@ function _mjwshared_civix_civicrm_angularModules(&$angularModules) {
}
}
+/**
+ * (Delegated) Implements hook_civicrm_themes().
+ *
+ * Find any and return any files matching "*.theme.php"
+ */
+function _mjwshared_civix_civicrm_themes(&$themes) {
+ $files = _mjwshared_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.
*
@@ -342,11 +363,12 @@ function _mjwshared_civix_civicrm_angularModules(&$angularModules) {
*
* @link http://php.net/glob
* @param string $pattern
- * @return array, possibly empty
+ *
+ * @return array
*/
function _mjwshared_civix_glob($pattern) {
$result = glob($pattern);
- return is_array($result) ? $result : array();
+ return is_array($result) ? $result : [];
}
/**
@@ -357,16 +379,18 @@ function _mjwshared_civix_glob($pattern) {
* 'Mailing', or 'Administer/System Settings'
* @param array $item - the item to insert (parent/child attributes will be
* filled for you)
+ *
+ * @return bool
*/
function _mjwshared_civix_insert_navigation_menu(&$menu, $path, $item) {
// If we are done going down the path, insert menu
if (empty($path)) {
- $menu[] = array(
- 'attributes' => array_merge(array(
+ $menu[] = [
+ 'attributes' => array_merge([
'label' => CRM_Utils_Array::value('name', $item),
'active' => 1,
- ), $item),
- );
+ ], $item),
+ ];
return TRUE;
}
else {
@@ -377,9 +401,9 @@ function _mjwshared_civix_insert_navigation_menu(&$menu, $path, $item) {
foreach ($menu as $key => &$entry) {
if ($entry['attributes']['name'] == $first) {
if (!isset($entry['child'])) {
- $entry['child'] = array();
+ $entry['child'] = [];
}
- $found = _mjwshared_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+ $found = _mjwshared_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
}
}
return $found;
@@ -390,7 +414,7 @@ function _mjwshared_civix_insert_navigation_menu(&$menu, $path, $item) {
* (Delegated) Implements hook_civicrm_navigationMenu().
*/
function _mjwshared_civix_navigationMenu(&$nodes) {
- if (!is_callable(array('CRM_Core_BAO_Navigation', 'fixNavigationMenu'))) {
+ if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
_mjwshared_civix_fixNavigationMenu($nodes);
}
}
@@ -432,17 +456,11 @@ function _mjwshared_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID)
/**
* (Delegated) Implements hook_civicrm_alterSettingsFolders().
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
*/
function _mjwshared_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
- static $configured = FALSE;
- if ($configured) {
- return;
- }
- $configured = TRUE;
-
$settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
- if (is_dir($settingsDir) && !in_array($settingsDir, $metaDataFolders)) {
+ if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) {
$metaDataFolders[] = $settingsDir;
}
}
@@ -452,10 +470,8 @@ function _mjwshared_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL)
*
* Find any *.entityType.php files, merge their content, and return.
*
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
*/
-
function _mjwshared_civix_civicrm_entityTypes(&$entityTypes) {
- $entityTypes = array_merge($entityTypes, array (
- ));
+ $entityTypes = array_merge($entityTypes, []);
}
--
GitLab