diff --git a/info.xml b/info.xml
index 6a51118e6ce3f661f25ef03c91526f80d569be22..67cbe34b7cffd6512f5669f68102cd7e9d27240c 100644
--- a/info.xml
+++ b/info.xml
@@ -30,8 +30,14 @@
</requires>
<civix>
<namespace>CRM/Stripe</namespace>
+ <format>22.05.2</format>
</civix>
<classloader>
<psr4 prefix="Civi\" path="Civi"/>
</classloader>
+ <mixins>
+ <mixin>menu-xml@1.0.0</mixin>
+ <mixin>mgd-php@1.0.0</mixin>
+ <mixin>setting-php@1.0.0</mixin>
+ </mixins>
</extension>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0f9f25d307a9cd62aa26edb1928ddf2de81d249a..fc8f870b723b86a3cdf77609656b6ce38d0288ce 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<phpunit backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" syntaxCheck="false" bootstrap="tests/phpunit/bootstrap.php">
+<phpunit backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/phpunit/bootstrap.php">
<testsuites>
<testsuite name="My Test Suite">
<directory>./tests/phpunit</directory>
diff --git a/stripe.civix.php b/stripe.civix.php
index 5a30b4bd27c1ecb452dcc40411de08ddcd79d79c..b3164584c9f627ec1ce83dad656efdf0e903feed 100644
--- a/stripe.civix.php
+++ b/stripe.civix.php
@@ -91,9 +91,9 @@ function _stripe_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)) {
@@ -107,19 +107,6 @@ function _stripe_civix_civicrm_config(&$config = NULL) {
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 _stripe_civix_civicrm_xmlMenu(&$files) {
- foreach (_stripe_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
- $files[] = $file;
- }
-}
-
/**
* Implements hook_civicrm_install().
*
@@ -217,136 +204,6 @@ function _stripe_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 _stripe_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 _stripe_civix_civicrm_managed(&$entities) {
- $mgdFiles = _stripe_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 _stripe_civix_civicrm_caseTypes(&$caseTypes) {
- if (!is_dir(__DIR__ . '/xml/case')) {
- return;
- }
-
- foreach (_stripe_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 _stripe_civix_civicrm_angularModules(&$angularModules) {
- if (!is_dir(__DIR__ . '/ang')) {
- return;
- }
-
- $files = _stripe_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 _stripe_civix_civicrm_themes(&$themes) {
- $files = _stripe_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 _stripe_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 +286,6 @@ function _stripe_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) {
}
}
-/**
- * (Delegated) Implements hook_civicrm_alterSettingsFolders().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
- */
-function _stripe_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/stripe.php b/stripe.php
index 097f2c1f7c83eb91890a4236124ae22703fdaad0..aff6dc097eed77cc6793fea114bc8ec7bb71e961 100644
--- a/stripe.php
+++ b/stripe.php
@@ -24,15 +24,6 @@ function stripe_civicrm_config(&$config) {
_stripe_civix_civicrm_config($config);
}
-/**
- * Implementation of hook_civicrm_xmlMenu().
- *
- * @param $files array(string)
- */
-function stripe_civicrm_xmlMenu(&$files) {
- _stripe_civix_civicrm_xmlMenu($files);
-}
-
/**
* Implementation of hook_civicrm_install().
*/
@@ -75,16 +66,6 @@ function stripe_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
return _stripe_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.
- */
-function stripe_civicrm_managed(&$entities) {
- _stripe_civix_civicrm_managed($entities);
-}
-
/**
* Implements hook_civicrm_entityTypes().
*/
@@ -92,13 +73,6 @@ function stripe_civicrm_entityTypes(&$entityTypes) {
_stripe_civix_civicrm_entityTypes($entityTypes);
}
-/**
- * Implements hook_civicrm_alterSettingsFolders().
- */
-function stripe_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
- _stripe_civix_civicrm_alterSettingsFolders($metaDataFolders);
-}
-
/**
* Add stripe.js to forms, to generate stripe token
* hook_civicrm_alterContent is not called for all forms (eg. CRM_Contribute_Form_Contribution on backend)