From 24aef458c722579f3923ac3f5094246c52aea530 Mon Sep 17 00:00:00 2001
From: agileware-justin <agileware-justin@users.noreply.github.com>
Date: Wed, 25 Jan 2023 00:28:49 +0000
Subject: [PATCH] CIVIBLD-287 [AUTO] civix upgraded

Files changed:
M	eWAYRecurring.civix.php
M	info.xml
A	mixin/smarty-v2@1.0.0.mixin.php
---
 eWAYRecurring.civix.php         |  5 ---
 info.xml                        |  3 +-
 mixin/smarty-v2@1.0.0.mixin.php | 56 +++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 mixin/smarty-v2@1.0.0.mixin.php

diff --git a/eWAYRecurring.civix.php b/eWAYRecurring.civix.php
index 360ea12..c512dff 100644
--- a/eWAYRecurring.civix.php
+++ b/eWAYRecurring.civix.php
@@ -99,11 +99,6 @@ function _eWAYRecurring_civix_civicrm_config($config = NULL) {
   $configured = TRUE;
 
   $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
-  $extDir = $extRoot . 'templates';
-  if (file_exists($extDir)) {
-    CRM_Core_Smarty::singleton()->addTemplateDir($extDir);
-  }
-
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
   set_include_path($include_path);
   _eWAYRecurring_civix_mixin_polyfill();
diff --git a/info.xml b/info.xml
index 7d8c9b0..7c942d9 100644
--- a/info.xml
+++ b/info.xml
@@ -23,11 +23,12 @@
   <comments/>
   <civix>
     <namespace>CRM/eWAYRecurring</namespace>
-    <format>22.12.1</format>
+    <format>23.01.0</format>
   </civix>
   <mixins>
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
+    <mixin>smarty-v2@1.0.0</mixin>
   </mixins>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
diff --git a/mixin/smarty-v2@1.0.0.mixin.php b/mixin/smarty-v2@1.0.0.mixin.php
new file mode 100644
index 0000000..0b37105
--- /dev/null
+++ b/mixin/smarty-v2@1.0.0.mixin.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Auto-register "templates/" folder.
+ *
+ * @mixinName smarty-v2
+ * @mixinVersion 1.0.0
+ * @since 5.59
+ *
+ * @param CRM_Extension_MixInfo $mixInfo
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ * @param \CRM_Extension_BootCache $bootCache
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ */
+return function ($mixInfo, $bootCache) {
+  $dir = $mixInfo->getPath('templates');
+  if (!file_exists($dir)) {
+    return;
+  }
+
+  $register = function() use ($dir) {
+    // This implementation is useful for older versions of CiviCRM. It can be replaced/updated going forward (v1.1+).
+    $smarty = CRM_Core_Smarty::singleton();
+    if (!is_array($smarty->template_dir)) {
+      $this->template_dir = [$smarty->template_dir];
+    }
+    if (!in_array($dir, $smarty->template_dir)) {
+      array_unshift($smarty->template_dir, $dir);
+    }
+  };
+
+  // Let's figure out what environment we're in -- so that we know the best way to call $register().
+
+  if (!empty($GLOBALS['_CIVIX_MIXIN_POLYFILL'])) {
+    // Polyfill Loader (v<=5.45): We're already in the middle of firing `hook_config`.
+    if ($mixInfo->isActive()) {
+      $register();
+    }
+    return;
+  }
+
+  if (CRM_Extension_System::singleton()->getManager()->extensionIsBeingInstalledOrEnabled($mixInfo->longName)) {
+    // New Install, Standard Loader: The extension has just been enabled, and we're now setting it up.
+    // System has already booted. New templates may be needed for upcoming installation steps.
+    $register();
+    return;
+  }
+
+  // Typical Pageview, Standard Loader: Defer the actual registration for a moment -- to ensure that Smarty is online.
+  \Civi::dispatcher()->addListener('hook_civicrm_config', function() use ($mixInfo, $register) {
+    if ($mixInfo->isActive()) {
+      $register();
+    }
+  });
+
+};