diff --git a/CRM/TwingleCampaign/BAO/TwingleEvent.php b/CRM/TwingleCampaign/BAO/TwingleEvent.php
index faf609b..4248c1d 100644
--- a/CRM/TwingleCampaign/BAO/TwingleEvent.php
+++ b/CRM/TwingleCampaign/BAO/TwingleEvent.php
@@ -219,15 +219,13 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign {
private
static function matchContact(string $names, string $email): ?int {
$names = StringOps::split_names($names); // Hopefully just a temporary solution
- $firstnames = $names['firstnames'] ?? NULL;
- $lastname = $names['lastname'] ?? NULL;
- $display_name = $names['display_name'] ?? NULL;
+ $firstnames = $names['firstnames'];
+ $lastname = $names['lastname'];
try {
$contact = civicrm_api3('Contact', 'getorcreate', [
'xcm_profile' => Civi::settings()->get('twinglecampaign_xcm_profile'),
'first_name' => $firstnames,
'last_name' => $lastname,
- 'display_name' => $display_name,
'email' => $email,
]);
return (int) $contact['id'];
diff --git a/CRM/TwingleCampaign/Exceptions/TwingleCampaignException.php b/CRM/TwingleCampaign/Exceptions/TwingleCampaignException.php
index 61baf6b..0f99555 100644
--- a/CRM/TwingleCampaign/Exceptions/TwingleCampaignException.php
+++ b/CRM/TwingleCampaign/Exceptions/TwingleCampaignException.php
@@ -1,8 +1,8 @@
$e->getMessage()]
),
E::ts('Scheduled Job'),
- 'error'
+ error
);
}
diff --git a/CRM/TwingleCampaign/Utils/APIWrapper.php b/CRM/TwingleCampaign/Utils/APIWrapper.php
index 06ff396..5afe426 100644
--- a/CRM/TwingleCampaign/Utils/APIWrapper.php
+++ b/CRM/TwingleCampaign/Utils/APIWrapper.php
@@ -40,8 +40,8 @@ class CRM_TwingleCampaign_Utils_APIWrapper {
$response_copy = $response;
// Create soft credit for contribution
- if (array_key_exists('contribution', $response)) {
- $contribution = array_shift($response_copy['contribution']);
+ if (array_key_exists('contribution', $response['values'])) {
+ $contribution = array_shift($response_copy['values']['contribution']);
if (array_key_exists('campaign_id', $contribution)) {
try {
$twingle_event = civicrm_api3(
@@ -49,7 +49,7 @@ class CRM_TwingleCampaign_Utils_APIWrapper {
'getsingle',
['id' => $contribution['campaign_id']]
);
- $response['soft_credit'] =
+ $response['values']['soft_credit'] =
self::createSoftCredit($contribution, $twingle_event)['values'];
$event->setResponse($response);
} catch (CiviCRM_API3_Exception $e) {
@@ -58,8 +58,8 @@ class CRM_TwingleCampaign_Utils_APIWrapper {
}
}
// Create soft credit for sepa mandate
- elseif (array_key_exists('sepa_mandate', $response)) {
- $sepa_mandate = array_pop($response_copy['sepa_mandate']);
+ elseif (array_key_exists('sepa_mandate', $response['values'])) {
+ $sepa_mandate = array_pop($response_copy['values']['sepa_mandate']);
try {
$contribution = civicrm_api3(
@@ -84,7 +84,7 @@ class CRM_TwingleCampaign_Utils_APIWrapper {
'getsingle',
['id' => $contribution['contribution_campaign_id']]
);
- $response['soft_credit'] =
+ $response['values']['soft_credit'] =
self::createSoftCredit($contribution, $twingle_event)['values'];
$event->setResponse($response);
} catch (CiviCRM_API3_Exception $e) {
@@ -103,12 +103,12 @@ class CRM_TwingleCampaign_Utils_APIWrapper {
* the de.systopia.twingle extension can include the campaign into the
* contribution which it will create.
*
- * @param array $apiRequest
- * @param callable $callsame
+ * @param $apiRequest
+ * @param $callsame
*
* @return mixed
*/
- public static function mapDonation(array $apiRequest, callable $callsame) {
+ public function mapDonation($apiRequest, $callsame) {
if (array_key_exists(
'campaign_id',
@@ -129,7 +129,11 @@ class CRM_TwingleCampaign_Utils_APIWrapper {
}
}
}
- elseif (!empty($apiRequest['params']['custom_fields']['event'])) {
+ elseif (array_key_exists(
+ 'event',
+ $apiRequest['params']['custom_fields']) &&
+ !empty($apiRequest['params']['custom_fields']['event'])
+ ) {
try {
$targetCampaign = civicrm_api3(
'TwingleEvent',
@@ -200,9 +204,7 @@ class CRM_TwingleCampaign_Utils_APIWrapper {
'contribution_id' => $contribution['id'],
]
);
-
- throw $e;
}
}
-}
+}
\ No newline at end of file
diff --git a/CRM/TwingleCampaign/Utils/StringOperations.php b/CRM/TwingleCampaign/Utils/StringOperations.php
index 98e6657..19c0fd3 100644
--- a/CRM/TwingleCampaign/Utils/StringOperations.php
+++ b/CRM/TwingleCampaign/Utils/StringOperations.php
@@ -49,7 +49,7 @@ class CRM_TwingleCampaign_Utils_StringOperations {
$firstnames = implode(" ", $names);
return ['firstnames' => $firstnames, 'lastname' => $lastname];
}
- return ['display_name' => $string];
+ return $string;
}
/**
@@ -71,4 +71,4 @@ class CRM_TwingleCampaign_Utils_StringOperations {
public static function startsWith($haystack, $needle): bool {
return substr_compare($haystack, $needle, 0, strlen($needle)) === 0;
}
-}
+}
\ No newline at end of file
diff --git a/api/v3/TwingleProject/Sync.php b/api/v3/TwingleProject/Sync.php
index ca72d0e..aed3d2a 100644
--- a/api/v3/TwingleProject/Sync.php
+++ b/api/v3/TwingleProject/Sync.php
@@ -193,8 +193,8 @@ function civicrm_api3_twingle_project_Sync(array $params): array {
foreach ($projects_from_civicrm['values'] as $project_from_civicrm) {
if (
!in_array($project_from_civicrm['project_id'],
- array_column($projects_from_twingle, 'id'),
- ) && $project_from_civicrm['is_active'] == 1) {
+ array_column($projects_from_twingle, 'id')
+ )) {
// store campaign id in $id
$id = $project_from_civicrm['id'];
unset($project_from_civicrm['id']);
diff --git a/info.xml b/info.xml
index 7971b85..c4eafde 100644
--- a/info.xml
+++ b/info.xml
@@ -14,21 +14,27 @@
https://lab.civicrm.org/Marc_Michalsky/de-forumzfd-twinglecampaign/-/issues
http://www.gnu.org/licenses/agpl-3.0.html
- 2024-06-15
- 1.0.8
+ 2023-02-28
+ 1.0.5
stable
- 5.74
+ 5.14.0
+
de.systopia.xcm
- de.systopia.campaign
+ campaignmanager
de.systopia.twingle
+
CRM/TwingleCampaign
+ 22.10.0
+
+ menu-xml@1.0.0
+
diff --git a/mixin/menu-xml@1.0.0.mixin.php b/mixin/menu-xml@1.0.0.mixin.php
new file mode 100644
index 0000000..4c0b227
--- /dev/null
+++ b/mixin/menu-xml@1.0.0.mixin.php
@@ -0,0 +1,31 @@
+addListener('hook_civicrm_xmlMenu', function ($e) use ($mixInfo) {
+ if (!$mixInfo->isActive()) {
+ return;
+ }
+
+ $files = (array) glob($mixInfo->getPath('xml/Menu/*.xml'));
+ foreach ($files as $file) {
+ $e->files[] = $file;
+ }
+ });
+
+};
diff --git a/mixin/polyfill.php b/mixin/polyfill.php
new file mode 100644
index 0000000..f57c5eb
--- /dev/null
+++ b/mixin/polyfill.php
@@ -0,0 +1,101 @@
+')) {
+ $mixinVers[$name] = $ver;
+ }
+ }
+ $mixins = [];
+ foreach ($mixinVers as $name => $ver) {
+ $mixins[] = "$name@$ver";
+ }
+
+ // Imitate CRM_Extension_MixInfo.
+ $mixInfo = new class() {
+
+ /**
+ * @var string
+ */
+ public $longName;
+
+ /**
+ * @var string
+ */
+ public $shortName;
+
+ public $_basePath;
+
+ public function getPath($file = NULL) {
+ return $this->_basePath . ($file === NULL ? '' : (DIRECTORY_SEPARATOR . $file));
+ }
+
+ public function isActive() {
+ return \CRM_Extension_System::singleton()->getMapper()->isActiveModule($this->shortName);
+ }
+
+ };
+ $mixInfo->longName = $longName;
+ $mixInfo->shortName = $shortName;
+ $mixInfo->_basePath = $basePath;
+
+ // Imitate CRM_Extension_BootCache.
+ $bootCache = new class() {
+
+ public function define($name, $callback) {
+ $envId = \CRM_Core_Config_Runtime::getId();
+ $oldExtCachePath = \Civi::paths()->getPath("[civicrm.compile]/CachedExtLoader.{$envId}.php");
+ $stat = stat($oldExtCachePath);
+ $file = Civi::paths()->getPath('[civicrm.compile]/CachedMixin.' . md5($name . ($stat['mtime'] ?? 0)) . '.php');
+ if (file_exists($file)) {
+ return include $file;
+ }
+ else {
+ $data = $callback();
+ file_put_contents($file, '<' . "?php\nreturn " . var_export($data, 1) . ';');
+ return $data;
+ }
+ }
+
+ };
+
+ // Imitate CRM_Extension_MixinLoader::run()
+ // Parse all live mixins before trying to scan any classes.
+ global $_CIVIX_MIXIN_POLYFILL;
+ foreach ($mixins as $mixin) {
+ // If the exact same mixin is defined by multiple exts, just use the first one.
+ if (!isset($_CIVIX_MIXIN_POLYFILL[$mixin])) {
+ $_CIVIX_MIXIN_POLYFILL[$mixin] = include_once $basePath . '/mixin/' . $mixin . '.mixin.php';
+ }
+ }
+ foreach ($mixins as $mixin) {
+ // If there's trickery about installs/uninstalls/resets, then we may need to register a second time.
+ if (!isset(\Civi::$statics[__FUNCTION__][$mixin])) {
+ \Civi::$statics[__FUNCTION__][$mixin] = 1;
+ $func = $_CIVIX_MIXIN_POLYFILL[$mixin];
+ $func($mixInfo, $bootCache);
+ }
+ }
+};
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index af5fa8c..c983bb5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,5 @@
-
+
./tests/phpunit
diff --git a/twinglecampaign.civix.php b/twinglecampaign.civix.php
index 575f31e..f9ec727 100644
--- a/twinglecampaign.civix.php
+++ b/twinglecampaign.civix.php
@@ -24,7 +24,7 @@ class CRM_TwingleCampaign_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_TwingleCampaign_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), '/');
}
@@ -79,6 +79,13 @@ class CRM_TwingleCampaign_ExtensionUtil {
use CRM_TwingleCampaign_ExtensionUtil as E;
+function _twinglecampaign_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().
*
@@ -91,9 +98,9 @@ function _twinglecampaign_civix_civicrm_config(&$config = NULL) {
}
$configured = TRUE;
- $template =& CRM_Core_Smarty::singleton();
+ $template = CRM_Core_Smarty::singleton();
- $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+ $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
$extDir = $extRoot . 'templates';
if (is_array($template->template_dir)) {
@@ -105,19 +112,7 @@ function _twinglecampaign_civix_civicrm_config(&$config = NULL) {
$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 _twinglecampaign_civix_civicrm_xmlMenu(&$files) {
- foreach (_twinglecampaign_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
- $files[] = $file;
- }
+ _twinglecampaign_civix_mixin_polyfill();
}
/**
@@ -130,6 +125,7 @@ function _twinglecampaign_civix_civicrm_install() {
if ($upgrader = _twinglecampaign_civix_upgrader()) {
$upgrader->onInstall();
}
+ _twinglecampaign_civix_mixin_polyfill();
}
/**
@@ -151,7 +147,7 @@ function _twinglecampaign_civix_civicrm_postInstall() {
*
* @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
*/
-function _twinglecampaign_civix_civicrm_uninstall() {
+function _twinglecampaign_civix_civicrm_uninstall(): void {
_twinglecampaign_civix_civicrm_config();
if ($upgrader = _twinglecampaign_civix_upgrader()) {
$upgrader->onUninstall();
@@ -163,13 +159,14 @@ function _twinglecampaign_civix_civicrm_uninstall() {
*
* @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
*/
-function _twinglecampaign_civix_civicrm_enable() {
+function _twinglecampaign_civix_civicrm_enable(): void {
_twinglecampaign_civix_civicrm_config();
if ($upgrader = _twinglecampaign_civix_upgrader()) {
if (is_callable([$upgrader, 'onEnable'])) {
$upgrader->onEnable();
}
}
+ _twinglecampaign_civix_mixin_polyfill();
}
/**
@@ -178,7 +175,7 @@ function _twinglecampaign_civix_civicrm_enable() {
* @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
* @return mixed
*/
-function _twinglecampaign_civix_civicrm_disable() {
+function _twinglecampaign_civix_civicrm_disable(): void {
_twinglecampaign_civix_civicrm_config();
if ($upgrader = _twinglecampaign_civix_upgrader()) {
if (is_callable([$upgrader, 'onDisable'])) {
@@ -217,136 +214,6 @@ function _twinglecampaign_civix_upgrader() {
}
}
-/**
- * Search directory tree for files which match a glob pattern.
- *
- * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
- * Note: Delegate to CRM_Utils_File::findFiles(), this function kept only
- * for backward compatibility of extension code that uses it.
- *
- * @param string $dir base dir
- * @param string $pattern , glob pattern, eg "*.txt"
- *
- * @return array
- */
-function _twinglecampaign_civix_find_files($dir, $pattern) {
- return CRM_Utils_File::findFiles($dir, $pattern);
-}
-
-/**
- * (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 _twinglecampaign_civix_civicrm_managed(&$entities) {
- $mgdFiles = _twinglecampaign_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 _twinglecampaign_civix_civicrm_caseTypes(&$caseTypes) {
- if (!is_dir(__DIR__ . '/xml/case')) {
- return;
- }
-
- foreach (_twinglecampaign_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 _twinglecampaign_civix_civicrm_angularModules(&$angularModules) {
- if (!is_dir(__DIR__ . '/ang')) {
- return;
- }
-
- $files = _twinglecampaign_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 _twinglecampaign_civix_civicrm_themes(&$themes) {
- $files = _twinglecampaign_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 _twinglecampaign_civix_glob($pattern) {
- $result = glob($pattern);
- return is_array($result) ? $result : [];
-}
-
/**
* Inserts a navigation menu item at a given place in the hierarchy.
*
@@ -429,18 +296,6 @@ function _twinglecampaign_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $par
}
}
-/**
- * (Delegated) Implements hook_civicrm_alterSettingsFolders().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
- */
-function _twinglecampaign_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().
*
diff --git a/twinglecampaign.php b/twinglecampaign.php
index 04ff8ca..79b016f 100644
--- a/twinglecampaign.php
+++ b/twinglecampaign.php
@@ -422,7 +422,6 @@ function _validateAndSendInput($id, $campaign_type_id): bool {
return TRUE;
}
-
///**
// * ## Implements hook_civicrm_post().
// *
@@ -458,14 +457,7 @@ function _validateAndSendInput($id, $campaign_type_id): bool {
// }
//}
-/**
- * Implements hook_civicrm_xmlMenu().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
- */
-function twinglecampaign_civicrm_xmlMenu(&$files) {
- _twinglecampaign_civix_civicrm_xmlMenu($files);
-}
+
/**
* Implements hook_civicrm_install().
@@ -521,54 +513,6 @@ function twinglecampaign_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
return _twinglecampaign_civix_civicrm_upgrade($op, $queue);
}
-/**
- * Implements hook_civicrm_managed().
- *
- * Generate a list of entities to create/deactivate/delete when this module
- * is installed, disabled, uninstalled.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
- */
-function twinglecampaign_civicrm_managed(&$entities) {
- _twinglecampaign_civix_civicrm_managed($entities);
-}
-
-/**
- * Implements hook_civicrm_caseTypes().
- *
- * Generate a list of case-types.
- *
- * Note: This hook only runs in CiviCRM 4.4+.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
- */
-function twinglecampaign_civicrm_caseTypes(&$caseTypes) {
- _twinglecampaign_civix_civicrm_caseTypes($caseTypes);
-}
-
-/**
- * Implements hook_civicrm_angularModules().
- *
- * Generate a list of Angular modules.
- *
- * Note: This hook only runs in CiviCRM 4.5+. It may
- * use features only available in v4.6+.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
- */
-function twinglecampaign_civicrm_angularModules(&$angularModules) {
- _twinglecampaign_civix_civicrm_angularModules($angularModules);
-}
-
-/**
- * Implements hook_civicrm_alterSettingsFolders().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
- */
-function twinglecampaign_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
- _twinglecampaign_civix_civicrm_alterSettingsFolders($metaDataFolders);
-}
-
/**
* Implements hook_civicrm_entityTypes().
*
@@ -580,13 +524,6 @@ function twinglecampaign_civicrm_entityTypes(&$entityTypes) {
_twinglecampaign_civix_civicrm_entityTypes($entityTypes);
}
-/**
- * Implements hook_civicrm_thems().
- */
-function twinglecampaign_civicrm_themes(&$themes) {
- _twinglecampaign_civix_civicrm_themes($themes);
-}
-
// --- Functions below this ship commented out. Uncomment as required. ---
/**