diff --git a/CRM/Stripe/Upgrader.php b/CRM/Stripe/Upgrader.php
index 9ed0b7f1981f51c3917b660e218490579312593e..33962fe060294281e95041fba90a8d225f2fb9c1 100644
--- a/CRM/Stripe/Upgrader.php
+++ b/CRM/Stripe/Upgrader.php
@@ -17,7 +17,7 @@ use CRM_Stripe_ExtensionUtil as E;
* Naming scheme upgrade_X_Y_Z is offically wrong!
* https://chat.civicrm.org/civicrm/pl/usx3pfjzjbrhzpewuggu1e6ftw
*/
-class CRM_Stripe_Upgrader extends CRM_Stripe_Upgrader_Base {
+class CRM_Stripe_Upgrader extends CRM_Extension_Upgrader_Base {
// By convention, functions that look like "function upgrade_NNNN()" are
// upgrade tasks. They are executed in order (like Drupal's hook_update_N).
diff --git a/CRM/Stripe/Upgrader/Base.php b/CRM/Stripe/Upgrader/Base.php
deleted file mode 100644
index 9bdc78c189564a0bae6e0bfc6fa25205a19c9a9b..0000000000000000000000000000000000000000
--- a/CRM/Stripe/Upgrader/Base.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-
-// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
-use CRM_Stripe_ExtensionUtil as E;
-
-/**
- * Base class which provides helpers to execute upgrade logic
- */
-class CRM_Stripe_Upgrader_Base {
-
- /**
- * @var CRM_Stripe_Upgrader_Base subclass of this
- */
- public static $instance;
-
- /**
- * @var CRM_Queue_TaskContext
- */
- protected $ctx;
-
- /**
- * @var string eg 'com.example.myextension'
- */
- protected $extensionName;
-
- /**
- * @var string full path to the extension's source tree
- */
- protected $extensionDir;
-
- /**
- * @var revisionNumber[]
- * sorted numerically
- */
- private $revisions;
-
- /**
- * @var bool
- * Flag to clean up extension revision data in civicrm_setting
- */
- private $revisionStorageIsDeprecated = FALSE;
-
- /**
- * Obtain a reference to the active upgrade handler.
- */
- public static function instance() {
- if (!self::$instance) {
- // FIXME auto-generate
- self::$instance = new CRM_Stripe_Upgrader(
- 'com.drastikbydesign.stripe',
- E::path()
- );
- }
- return self::$instance;
- }
-
- /**
- * Adapter that lets you add normal (non-static) member functions to the queue.
- *
- * Note: Each upgrader instance should only be associated with one
- * task-context; otherwise, this will be non-reentrant.
- *
- * @code
- * CRM_Stripe_Upgrader_Base::_queueAdapter($ctx, 'methodName', 'arg1', 'arg2');
- * @endcode
- */
- public static function _queueAdapter() {
- $instance = self::instance();
- $args = func_get_args();
- $instance->ctx = array_shift($args);
- $instance->queue = $instance->ctx->queue;
- $method = array_shift($args);
- return call_user_func_array([$instance, $method], $args);
- }
-
- /**
- * CRM_Stripe_Upgrader_Base constructor.
- *
- * @param $extensionName
- * @param $extensionDir
- */
- public function __construct($extensionName, $extensionDir) {
- $this->extensionName = $extensionName;
- $this->extensionDir = $extensionDir;
- }
-
- // ******** Task helpers ********
-
- /**
- * Run a CustomData file.
- *
- * @param string $relativePath the CustomData XML file path (relative to this extension's dir)
- * @return bool
- */
- public function executeCustomDataFile($relativePath) {
- $xml_file = $this->extensionDir . '/' . $relativePath;
- return $this->executeCustomDataFileByAbsPath($xml_file);
- }
-
- /**
- * Run a CustomData file
- *
- * @param string $xml_file the CustomData XML file path (absolute path)
- *
- * @return bool
- */
- protected function executeCustomDataFileByAbsPath($xml_file) {
- $import = new CRM_Utils_Migrate_Import();
- $import->run($xml_file);
- return TRUE;
- }
-
- /**
- * Run a SQL file.
- *
- * @param string $relativePath the SQL file path (relative to this extension's dir)
- *
- * @return bool
- */
- public function executeSqlFile($relativePath) {
- CRM_Utils_File::sourceSQLFile(
- CIVICRM_DSN,
- $this->extensionDir . DIRECTORY_SEPARATOR . $relativePath
- );
- return TRUE;
- }
-
- /**
- * Run the sql commands in the specified file.
- *
- * @param string $tplFile
- * The SQL file path (relative to this extension's dir).
- * Ex: "sql/mydata.mysql.tpl".
- *
- * @return bool
- * @throws \CRM_Core_Exception
- */
- public function executeSqlTemplate($tplFile) {
- // Assign multilingual variable to Smarty.
- $upgrade = new CRM_Upgrade_Form();
-
- $tplFile = CRM_Utils_File::isAbsolute($tplFile) ? $tplFile : $this->extensionDir . DIRECTORY_SEPARATOR . $tplFile;
- $smarty = CRM_Core_Smarty::singleton();
- $smarty->assign('domainID', CRM_Core_Config::domainID());
- CRM_Utils_File::sourceSQLFile(
- CIVICRM_DSN, $smarty->fetch($tplFile), NULL, TRUE
- );
- return TRUE;
- }
-
- /**
- * Run one SQL query.
- *
- * This is just a wrapper for CRM_Core_DAO::executeSql, but it
- * provides syntactic sugar for queueing several tasks that
- * run different queries
- *
- * @return bool
- */
- public function executeSql($query, $params = []) {
- // FIXME verify that we raise an exception on error
- CRM_Core_DAO::executeQuery($query, $params);
- return TRUE;
- }
-
- /**
- * Syntactic sugar for enqueuing a task which calls a function in this class.
- *
- * The task is weighted so that it is processed
- * as part of the currently-pending revision.
- *
- * After passing the $funcName, you can also pass parameters that will go to
- * the function. Note that all params must be serializable.
- */
- public function addTask($title) {
- $args = func_get_args();
- $title = array_shift($args);
- $task = new CRM_Queue_Task(
- [get_class($this), '_queueAdapter'],
- $args,
- $title
- );
- return $this->queue->createItem($task, ['weight' => -1]);
- }
-
- // ******** Revision-tracking helpers ********
-
- /**
- * Determine if there are any pending revisions.
- *
- * @return bool
- */
- public function hasPendingRevisions() {
- $revisions = $this->getRevisions();
- $currentRevision = $this->getCurrentRevision();
-
- if (empty($revisions)) {
- return FALSE;
- }
- if (empty($currentRevision)) {
- return TRUE;
- }
-
- return ($currentRevision < max($revisions));
- }
-
- /**
- * Add any pending revisions to the queue.
- */
- public function enqueuePendingRevisions(CRM_Queue_Queue $queue) {
- $this->queue = $queue;
-
- $currentRevision = $this->getCurrentRevision();
- foreach ($this->getRevisions() as $revision) {
- if ($revision > $currentRevision) {
- $title = E::ts('Upgrade %1 to revision %2', [
- 1 => $this->extensionName,
- 2 => $revision,
- ]);
-
- // note: don't use addTask() because it sets weight=-1
-
- $task = new CRM_Queue_Task(
- [get_class($this), '_queueAdapter'],
- ['upgrade_' . $revision],
- $title
- );
- $this->queue->createItem($task);
-
- $task = new CRM_Queue_Task(
- [get_class($this), '_queueAdapter'],
- ['setCurrentRevision', $revision],
- $title
- );
- $this->queue->createItem($task);
- }
- }
- }
-
- /**
- * Get a list of revisions.
- *
- * @return array(revisionNumbers) sorted numerically
- */
- public function getRevisions() {
- if (!is_array($this->revisions)) {
- $this->revisions = [];
-
- $clazz = new ReflectionClass(get_class($this));
- $methods = $clazz->getMethods();
- foreach ($methods as $method) {
- if (preg_match('/^upgrade_(.*)/', $method->name, $matches)) {
- $this->revisions[] = $matches[1];
- }
- }
- sort($this->revisions, SORT_NUMERIC);
- }
-
- return $this->revisions;
- }
-
- public function getCurrentRevision() {
- $revision = CRM_Core_BAO_Extension::getSchemaVersion($this->extensionName);
- if (!$revision) {
- $revision = $this->getCurrentRevisionDeprecated();
- }
- return $revision;
- }
-
- private function getCurrentRevisionDeprecated() {
- $key = $this->extensionName . ':version';
- if ($revision = \Civi::settings()->get($key)) {
- $this->revisionStorageIsDeprecated = TRUE;
- }
- return $revision;
- }
-
- public function setCurrentRevision($revision) {
- CRM_Core_BAO_Extension::setSchemaVersion($this->extensionName, $revision);
- // clean up legacy schema version store (CRM-19252)
- $this->deleteDeprecatedRevision();
- return TRUE;
- }
-
- private function deleteDeprecatedRevision() {
- if ($this->revisionStorageIsDeprecated) {
- $setting = new CRM_Core_BAO_Setting();
- $setting->name = $this->extensionName . ':version';
- $setting->delete();
- CRM_Core_Error::debug_log_message("Migrated extension schema revision ID for {$this->extensionName} from civicrm_setting (deprecated) to civicrm_extension.\n");
- }
- }
-
- // ******** Hook delegates ********
-
- /**
- * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
- */
- public function onInstall() {
- $files = glob($this->extensionDir . '/sql/*_install.sql');
- if (is_array($files)) {
- foreach ($files as $file) {
- CRM_Utils_File::sourceSQLFile(CIVICRM_DSN, $file);
- }
- }
- $files = glob($this->extensionDir . '/sql/*_install.mysql.tpl');
- if (is_array($files)) {
- foreach ($files as $file) {
- $this->executeSqlTemplate($file);
- }
- }
- $files = glob($this->extensionDir . '/xml/*_install.xml');
- if (is_array($files)) {
- foreach ($files as $file) {
- $this->executeCustomDataFileByAbsPath($file);
- }
- }
- if (is_callable([$this, 'install'])) {
- $this->install();
- }
- }
-
- /**
- * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
- */
- public function onPostInstall() {
- $revisions = $this->getRevisions();
- if (!empty($revisions)) {
- $this->setCurrentRevision(max($revisions));
- }
- if (is_callable([$this, 'postInstall'])) {
- $this->postInstall();
- }
- }
-
- /**
- * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
- */
- public function onUninstall() {
- $files = glob($this->extensionDir . '/sql/*_uninstall.mysql.tpl');
- if (is_array($files)) {
- foreach ($files as $file) {
- $this->executeSqlTemplate($file);
- }
- }
- if (is_callable([$this, 'uninstall'])) {
- $this->uninstall();
- }
- $files = glob($this->extensionDir . '/sql/*_uninstall.sql');
- if (is_array($files)) {
- foreach ($files as $file) {
- CRM_Utils_File::sourceSQLFile(CIVICRM_DSN, $file);
- }
- }
- }
-
- /**
- * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
- */
- public function onEnable() {
- // stub for possible future use
- if (is_callable([$this, 'enable'])) {
- $this->enable();
- }
- }
-
- /**
- * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
- */
- public function onDisable() {
- // stub for possible future use
- if (is_callable([$this, 'disable'])) {
- $this->disable();
- }
- }
-
- public function onUpgrade($op, CRM_Queue_Queue $queue = NULL) {
- switch ($op) {
- case 'check':
- return [$this->hasPendingRevisions()];
-
- case 'enqueue':
- return $this->enqueuePendingRevisions($queue);
-
- default:
- }
- }
-
-}
diff --git a/info.xml b/info.xml
index 7a3606cf84a7c8ab54e5841108b2b239512c8912..2211725b142eafbe1d4182343c18643553008030 100644
--- a/info.xml
+++ b/info.xml
@@ -31,15 +31,18 @@
</requires>
<civix>
<namespace>CRM/Stripe</namespace>
- <format>22.10.0</format>
+ <format>23.02.1</format>
</civix>
<classloader>
<psr0 prefix="CRM_" path="."/>
<psr4 prefix="Civi\" path="Civi"/>
</classloader>
<mixins>
- <mixin>menu-xml@1.0.0</mixin>
+ `<mixin>menu-xml@1.0.0</mixin>`
<mixin>mgd-php@1.0.0</mixin>
<mixin>setting-php@1.0.0</mixin>
+ <mixin>smarty-v2@1.0.0</mixin>
+ <mixin>entity-types-php@1.0.0</mixin>
</mixins>
+ <upgrader>CRM_Stripe_Upgrader</upgrader>
</extension>
diff --git a/stripe.civix.php b/stripe.civix.php
index a50aefbe377a2114b71faec8fd7049002767e158..725be6c7970db37c09a3497c31899c0fa5632f79 100644
--- a/stripe.civix.php
+++ b/stripe.civix.php
@@ -84,27 +84,17 @@ use CRM_Stripe_ExtensionUtil as E;
*
* @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
*/
-function _stripe_civix_civicrm_config(&$config = NULL) {
+function _stripe_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];
- }
-
$include_path = $extRoot . PATH_SEPARATOR . get_include_path();
set_include_path($include_path);
+ // Based on <compatibility>, this does not currently require mixin/polyfill.php.
}
/**
@@ -114,35 +104,7 @@ function _stripe_civix_civicrm_config(&$config = NULL) {
*/
function _stripe_civix_civicrm_install() {
_stripe_civix_civicrm_config();
- if ($upgrader = _stripe_civix_upgrader()) {
- $upgrader->onInstall();
- }
-}
-
-/**
- * Implements hook_civicrm_postInstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
- */
-function _stripe_civix_civicrm_postInstall() {
- _stripe_civix_civicrm_config();
- if ($upgrader = _stripe_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 _stripe_civix_civicrm_uninstall(): void {
- _stripe_civix_civicrm_config();
- if ($upgrader = _stripe_civix_upgrader()) {
- $upgrader->onUninstall();
- }
+ // Based on <compatibility>, this does not currently require mixin/polyfill.php.
}
/**
@@ -152,56 +114,7 @@ function _stripe_civix_civicrm_uninstall(): void {
*/
function _stripe_civix_civicrm_enable(): void {
_stripe_civix_civicrm_config();
- if ($upgrader = _stripe_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 _stripe_civix_civicrm_disable(): void {
- _stripe_civix_civicrm_config();
- if ($upgrader = _stripe_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 _stripe_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
- if ($upgrader = _stripe_civix_upgrader()) {
- return $upgrader->onUpgrade($op, $queue);
- }
-}
-
-/**
- * @return CRM_Stripe_Upgrader
- */
-function _stripe_civix_upgrader() {
- if (!file_exists(__DIR__ . '/CRM/Stripe/Upgrader.php')) {
- return NULL;
- }
- else {
- return CRM_Stripe_Upgrader_Base::instance();
- }
+ // Based on <compatibility>, this does not currently require mixin/polyfill.php.
}
/**
@@ -285,25 +198,3 @@ function _stripe_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) {
}
}
}
-
-/**
- * (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 _stripe_civix_civicrm_entityTypes(&$entityTypes) {
- $entityTypes = array_merge($entityTypes, [
- 'CRM_Stripe_DAO_StripeCustomer' => [
- 'name' => 'StripeCustomer',
- 'class' => 'CRM_Stripe_DAO_StripeCustomer',
- 'table' => 'civicrm_stripe_customers',
- ],
- 'CRM_Stripe_DAO_StripePaymentintent' => [
- 'name' => 'StripePaymentintent',
- 'class' => 'CRM_Stripe_DAO_StripePaymentintent',
- 'table' => 'civicrm_stripe_paymentintent',
- ],
- ]);
-}
diff --git a/stripe.php b/stripe.php
index d3aefbf16d3f108766e1be3b0732b04ffecd19d8..fa2d991e3c108d1f2fa868ec40b61310f0e4bcf8 100644
--- a/stripe.php
+++ b/stripe.php
@@ -31,20 +31,6 @@ function stripe_civicrm_install() {
_stripe_civix_civicrm_install();
}
-/**
- * Implementation of hook_civicrm_postInstall
- */
-function stripe_civicrm_postInstall() {
- _stripe_civix_civicrm_postInstall();
-}
-
-/**
- * Implementation of hook_civicrm_uninstall().
- */
-function stripe_civicrm_uninstall() {
- _stripe_civix_civicrm_uninstall();
-}
-
/**
* Implementation of hook_civicrm_enable().
*/
@@ -52,27 +38,6 @@ function stripe_civicrm_enable() {
_stripe_civix_civicrm_enable();
}
-/**
- * Implementation of hook_civicrm_disable().
- */
-function stripe_civicrm_disable() {
- return _stripe_civix_civicrm_disable();
-}
-
-/**
- * Implementation of hook_civicrm_upgrade
- */
-function stripe_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
- return _stripe_civix_civicrm_upgrade($op, $queue);
-}
-
-/**
- * Implements hook_civicrm_entityTypes().
- */
-function stripe_civicrm_entityTypes(&$entityTypes) {
- _stripe_civix_civicrm_entityTypes($entityTypes);
-}
-
/**
* 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)