From c1db4cf75f15c46635e319d2ca87f4ba91be4cc5 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 23 Feb 2023 16:47:05 -0800
Subject: [PATCH] ext/oauth_client - Update to civix v23.02.0

---
 ext/oauth-client/info.xml               |  4 +++-
 ext/oauth-client/oauth_client.civix.php | 30 -------------------------
 ext/oauth-client/oauth_client.php       | 11 ---------
 3 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml
index 3dc1a6e6dc..55593f630c 100644
--- a/ext/oauth-client/info.xml
+++ b/ext/oauth-client/info.xml
@@ -33,9 +33,11 @@
     <mixin>ang-php@1.0.0</mixin>
     <mixin>menu-xml@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>
   <civix>
     <namespace>CRM/OAuth</namespace>
-    <format>22.12.1</format>
+    <format>23.02.0</format>
   </civix>
 </extension>
diff --git a/ext/oauth-client/oauth_client.civix.php b/ext/oauth-client/oauth_client.civix.php
index 91cdf5cfa0..bf8cc5fd0a 100644
--- a/ext/oauth-client/oauth_client.civix.php
+++ b/ext/oauth-client/oauth_client.civix.php
@@ -92,9 +92,6 @@ function _oauth_client_civix_civicrm_config($config = NULL) {
   $configured = TRUE;
 
   $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
-  $extDir = $extRoot . 'templates';
-  CRM_Core_Smarty::singleton()->addTemplateDir($extDir);
-
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
   set_include_path($include_path);
   // Based on <compatibility>, this does not currently require mixin/polyfill.php.
@@ -201,30 +198,3 @@ function _oauth_client_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parent
     }
   }
 }
-
-/**
- * (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 _oauth_client_civix_civicrm_entityTypes(&$entityTypes) {
-  $entityTypes = array_merge($entityTypes, [
-    'CRM_OAuth_DAO_OAuthClient' => [
-      'name' => 'OAuthClient',
-      'class' => 'CRM_OAuth_DAO_OAuthClient',
-      'table' => 'civicrm_oauth_client',
-    ],
-    'CRM_OAuth_DAO_OAuthContactToken' => [
-      'name' => 'OAuthContactToken',
-      'class' => 'CRM_OAuth_DAO_OAuthContactToken',
-      'table' => 'civicrm_oauth_contact_token',
-    ],
-    'CRM_OAuth_DAO_OAuthSysToken' => [
-      'name' => 'OAuthSysToken',
-      'class' => 'CRM_OAuth_DAO_OAuthSysToken',
-      'table' => 'civicrm_oauth_systoken',
-    ],
-  ]);
-}
diff --git a/ext/oauth-client/oauth_client.php b/ext/oauth-client/oauth_client.php
index c1260c0fd6..fd23498bf8 100644
--- a/ext/oauth-client/oauth_client.php
+++ b/ext/oauth-client/oauth_client.php
@@ -44,17 +44,6 @@ function oauth_client_civicrm_permission(&$permissions) {
   ];
 }
 
-/**
- * Implements hook_civicrm_entityTypes().
- *
- * Declare entity types provided by this module.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
- */
-function oauth_client_civicrm_entityTypes(&$entityTypes) {
-  _oauth_client_civix_civicrm_entityTypes($entityTypes);
-}
-
 /**
  * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
  */
-- 
2.25.1