From 25d811e95e718b5becbd3ab628b1daad817cb55c Mon Sep 17 00:00:00 2001
From: agileware-fj <agileware-fj@users.noreply.github.com>
Date: Wed, 9 Aug 2023 05:50:24 +0000
Subject: [PATCH] CIVIBLD-287 [AUTO] civix upgraded

Files changed:
M	eWAYRecurring.civix.php
M	info.xml
R079	mixin/smarty-v2@1.0.0.mixin.php	mixin/smarty-v2@1.0.1.mixin.php
---
 eWAYRecurring.civix.php                           | 15 ++-------------
 info.xml                                          |  5 +++--
 ...@1.0.0.mixin.php => smarty-v2@1.0.1.mixin.php} | 13 ++++---------
 3 files changed, 9 insertions(+), 24 deletions(-)
 rename mixin/{smarty-v2@1.0.0.mixin.php => smarty-v2@1.0.1.mixin.php} (79%)

diff --git a/eWAYRecurring.civix.php b/eWAYRecurring.civix.php
index c512dff..66e718d 100644
--- a/eWAYRecurring.civix.php
+++ b/eWAYRecurring.civix.php
@@ -140,8 +140,8 @@ function _eWAYRecurring_civix_insert_navigation_menu(&$menu, $path, $item) {
   if (empty($path)) {
     $menu[] = [
       'attributes' => array_merge([
-        'label'      => CRM_Utils_Array::value('name', $item),
-        'active'     => 1,
+        'label' => $item['name'] ?? NULL,
+        'active' => 1,
       ], $item),
     ];
     return TRUE;
@@ -205,14 +205,3 @@ function _eWAYRecurring_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $paren
     }
   }
 }
-
-/**
- * (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 _eWAYRecurring_civix_civicrm_entityTypes(&$entityTypes) {
-  $entityTypes = array_merge($entityTypes, []);
-}
diff --git a/info.xml b/info.xml
index 35a5cd0..7fbd694 100644
--- a/info.xml
+++ b/info.xml
@@ -23,15 +23,16 @@
   <comments/>
   <civix>
     <namespace>CRM/eWAYRecurring</namespace>
-    <format>23.01.0</format>
+    <format>23.02.1</format>
   </civix>
   <mixins>
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.0</mixin>
+    <mixin>smarty-v2@1.0.1</mixin>
   </mixins>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
+    <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <upgrader>CRM_eWAYRecurring_Upgrader</upgrader>
 </extension>
diff --git a/mixin/smarty-v2@1.0.0.mixin.php b/mixin/smarty-v2@1.0.1.mixin.php
similarity index 79%
rename from mixin/smarty-v2@1.0.0.mixin.php
rename to mixin/smarty-v2@1.0.1.mixin.php
index 0b37105..5972dbd 100644
--- a/mixin/smarty-v2@1.0.0.mixin.php
+++ b/mixin/smarty-v2@1.0.1.mixin.php
@@ -4,7 +4,7 @@
  * Auto-register "templates/" folder.
  *
  * @mixinName smarty-v2
- * @mixinVersion 1.0.0
+ * @mixinVersion 1.0.1
  * @since 5.59
  *
  * @param CRM_Extension_MixInfo $mixInfo
@@ -19,14 +19,9 @@
   }
 
   $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);
-    }
+    // This implementation has a theoretical edge-case bug on older versions of CiviCRM where a template could
+    // be registered more than once.
+    CRM_Core_Smarty::singleton()->addTemplateDir($dir);
   };
 
   // Let's figure out what environment we're in -- so that we know the best way to call $register().