From e443ab0c2845bc2e5ebe1816eb7752d8f54621bd Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 3 Jun 2022 14:19:05 -0400
Subject: [PATCH] Mixin - update version tags and add comment for new version
 of mgd-php

---
 ext/afform/admin/info.xml     | 2 +-
 ext/afform/core/info.xml      | 2 +-
 ext/civicrm_admin_ui/info.xml | 2 +-
 ext/civigrant/info.xml        | 2 +-
 ext/ewaysingle/info.xml       | 2 +-
 ext/payflowpro/info.xml       | 2 +-
 ext/search_kit/info.xml       | 2 +-
 mixin/mgd-php@1/mixin.php     | 2 ++
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml
index bbe704461e..469b8c8f46 100644
--- a/ext/afform/admin/info.xml
+++ b/ext/afform/admin/info.xml
@@ -32,7 +32,7 @@
   <mixins>
     <mixin>ang-php@1.0.0</mixin>
     <mixin>menu-xml@1.0.0</mixin>
-    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>mgd-php@1.1.0</mixin>
     <mixin>afform-entity-php@1.0.0</mixin>
   </mixins>
 </extension>
diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml
index 5d2e887dea..fa76c03396 100644
--- a/ext/afform/core/info.xml
+++ b/ext/afform/core/info.xml
@@ -27,6 +27,6 @@
   </classloader>
   <mixins>
     <mixin>ang-php@1.0.0</mixin>
-    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>mgd-php@1.1.0</mixin>
   </mixins>
 </extension>
diff --git a/ext/civicrm_admin_ui/info.xml b/ext/civicrm_admin_ui/info.xml
index 4f0e065d60..d15d6920fb 100644
--- a/ext/civicrm_admin_ui/info.xml
+++ b/ext/civicrm_admin_ui/info.xml
@@ -33,6 +33,6 @@
     <angularModule>crmCivicrmAdminUi</angularModule>
   </civix>
   <mixins>
-    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>mgd-php@1.1.0</mixin>
   </mixins>
 </extension>
diff --git a/ext/civigrant/info.xml b/ext/civigrant/info.xml
index 7648d49449..02448a288b 100644
--- a/ext/civigrant/info.xml
+++ b/ext/civigrant/info.xml
@@ -30,7 +30,7 @@
   <upgrader>CRM_Grant_Upgrader</upgrader>
   <mixins>
     <mixin>menu-xml@1.0.0</mixin>
-    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>mgd-php@1.1.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Grant</namespace>
diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml
index 1594acce5d..e6f3190ac9 100644
--- a/ext/ewaysingle/info.xml
+++ b/ext/ewaysingle/info.xml
@@ -28,7 +28,7 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <mixins>
-    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>mgd-php@1.1.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Ewaysingle</namespace>
diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml
index e1239dcbca..2b733b6cc5 100644
--- a/ext/payflowpro/info.xml
+++ b/ext/payflowpro/info.xml
@@ -25,7 +25,7 @@
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
   <mixins>
-    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>mgd-php@1.1.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Payflowpro</namespace>
diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml
index 81dda50b82..2b73583eca 100644
--- a/ext/search_kit/info.xml
+++ b/ext/search_kit/info.xml
@@ -29,7 +29,7 @@
   <mixins>
     <mixin>ang-php@1.0.0</mixin>
     <mixin>menu-xml@1.0.0</mixin>
-    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>mgd-php@1.1.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Search</namespace>
diff --git a/mixin/mgd-php@1/mixin.php b/mixin/mgd-php@1/mixin.php
index 026602e44c..990ed89061 100644
--- a/mixin/mgd-php@1/mixin.php
+++ b/mixin/mgd-php@1/mixin.php
@@ -24,6 +24,8 @@ return function ($mixInfo, $bootCache) {
       return;
     }
 
+    // Optimization: if managed entities were requested for specific module(s),
+    // check name and return early if not applicable.
     if (is_array($event->modules) && !in_array($mixInfo->longName, $event->modules, TRUE)) {
       return;
     }
-- 
2.25.1