mixin/ang-php - Convert live Angular modules from `hook_angularModules` to `<mixin>`

diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml
index aed58fc759bb6e1522fd30799dccdc670352cfe8..deb1c78283b9dee1edcaa319caedbd208465b374 100644 (file)
--- a/ext/message_admin/info.xml
+++ b/ext/message_admin/info.xml
@@ -30,6 +30,9 @@
   <classloader>
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
+  <mixins>
+    <mixin>ang-php@1.0.0</mixin>
+  </mixins>
   <civix>
     <namespace>CRM/MessageAdmin</namespace>
   </civix>

diff --git a/ext/message_admin/message_admin.civix.php b/ext/message_admin/message_admin.civix.php
index d665c618f02984f06204dab37d02a8df20fa78b9..ee0c64c7e14906e192c84788e06d06ca99738e40 100644 (file)
--- a/ext/message_admin/message_admin.civix.php
+++ b/ext/message_admin/message_admin.civix.php
@@ -285,31 +285,6 @@ function _message_admin_civix_civicrm_caseTypes(&$caseTypes) {
   }
 }
 
-/**
- * (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 _message_admin_civix_civicrm_angularModules(&$angularModules) {
-  if (!is_dir(__DIR__ . '/ang')) {
-    return;
-  }
-
-  $files = _message_admin_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().
  *

diff --git a/ext/message_admin/message_admin.php b/ext/message_admin/message_admin.php
index 4efd0b74fbfaa8f2fad4f3389f4bc7c9714cfe62..acca57502de85e2f18bdffc7126b34ac9dbc5071 100644 (file)
--- a/ext/message_admin/message_admin.php
+++ b/ext/message_admin/message_admin.php
@@ -102,20 +102,6 @@ function message_admin_civicrm_caseTypes(&$caseTypes) {
   _message_admin_civix_civicrm_caseTypes($caseTypes);
 }
 
-/**
- * Implements hook_civicrm_angularModules().
- *
- * Generate a list of Angular modules.
- *
- * Note: This hook only runs in CiviCRM 4.5+. It may
- * use features only available in v4.6+.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
- */
-function message_admin_civicrm_angularModules(&$angularModules) {
-  _message_admin_civix_civicrm_angularModules($angularModules);
-}
-
 /**
  * Implements hook_civicrm_entityTypes().
  *

diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml
index 9458ed9f12287c8bd79e832c288cf0230ed76ff4..433c2fa4ab67009dc4b1150bc0a76587c62d9447 100644 (file)
--- a/ext/oauth-client/info.xml
+++ b/ext/oauth-client/info.xml
@@ -30,6 +30,7 @@
   </classloader>
   <upgrader>CRM_OAuth_Upgrader</upgrader>
   <mixins>
+    <mixin>ang-php@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
   </mixins>
   <civix>

diff --git a/ext/oauth-client/oauth_client.civix.php b/ext/oauth-client/oauth_client.civix.php
index 305b176ec74b0daac6018163a04b3631f2d84321..e48163534baefbbae890776a591550b265c7441c 100644 (file)
--- a/ext/oauth-client/oauth_client.civix.php
+++ b/ext/oauth-client/oauth_client.civix.php
@@ -285,31 +285,6 @@ function _oauth_client_civix_civicrm_caseTypes(&$caseTypes) {
   }
 }
 
-/**
- * (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 _oauth_client_civix_civicrm_angularModules(&$angularModules) {
-  if (!is_dir(__DIR__ . '/ang')) {
-    return;
-  }
-
-  $files = _oauth_client_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().
  *

diff --git a/ext/oauth-client/oauth_client.php b/ext/oauth-client/oauth_client.php
index ef2ac3542641ea5a11b778080599d356cacb0b7c..cdfb1a9cff30f431172dcf53d4cf7887f3851393 100644 (file)
--- a/ext/oauth-client/oauth_client.php
+++ b/ext/oauth-client/oauth_client.php
@@ -78,20 +78,6 @@ function oauth_client_civicrm_caseTypes(&$caseTypes) {
   _oauth_client_civix_civicrm_caseTypes($caseTypes);
 }
 
-/**
- * Implements hook_civicrm_angularModules().
- *
- * Generate a list of Angular modules.
- *
- * Note: This hook only runs in CiviCRM 4.5+. It may
- * use features only available in v4.6+.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
- */
-function oauth_client_civicrm_angularModules(&$angularModules) {
-  _oauth_client_civix_civicrm_angularModules($angularModules);
-}
-
 /**
  * Implements hook_civicrm_entityTypes().
  *

diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml
index b08d284384536aabf66ce29ea91f2f410c944f25..d31e49d4781ee958a7a77ff11fd8cb0c047466b4 100644 (file)
--- a/ext/search_kit/info.xml
+++ b/ext/search_kit/info.xml
@@ -26,6 +26,9 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <upgrader>CRM_Search_Upgrader</upgrader>
+  <mixins>
+    <mixin>ang-php@1.0.0</mixin>
+  </mixins>
   <civix>
     <namespace>CRM/Search</namespace>
   </civix>

diff --git a/ext/search_kit/search_kit.civix.php b/ext/search_kit/search_kit.civix.php
index fa2b1660c38bc61adb32ee99e72fe86631061545..66ce942fd2ded2c3aebd6d0b576ec7d0ce3a6492 100644 (file)
--- a/ext/search_kit/search_kit.civix.php
+++ b/ext/search_kit/search_kit.civix.php
@@ -285,31 +285,6 @@ function _search_kit_civix_civicrm_caseTypes(&$caseTypes) {
   }
 }
 
-/**
- * (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 _search_kit_civix_civicrm_angularModules(&$angularModules) {
-  if (!is_dir(__DIR__ . '/ang')) {
-    return;
-  }
-
-  $files = _search_kit_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().
  *

diff --git a/ext/search_kit/search_kit.php b/ext/search_kit/search_kit.php
index 50fb6085ae2cd55ee459baf1e6a1a8a62ca1cf04..431e6103d2460674baea88e42b54498a51db7ed7 100644 (file)
--- a/ext/search_kit/search_kit.php
+++ b/ext/search_kit/search_kit.php
@@ -70,7 +70,6 @@ function search_kit_civicrm_managed(&$entities) {
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
  */
 function search_kit_civicrm_angularModules(&$angularModules) {
-  _search_kit_civix_civicrm_angularModules($angularModules);
   // Fetch all search tasks provided by extensions and add their Angular modules as crmSearchTasks dependencies
   $tasks = [];
   $null = NULL;