From 28bda3f6a5bf4209a345f60a01ec820b4d96c10f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 8 Sep 2022 19:33:07 -0700
Subject: [PATCH] Extensions - Within civicrm-core, only search the 'ext' and
 'tools' folders.

---
 CRM/Extension/System.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/CRM/Extension/System.php b/CRM/Extension/System.php
index 98815e8758..60cf564bca 100644
--- a/CRM/Extension/System.php
+++ b/CRM/Extension/System.php
@@ -18,7 +18,7 @@
  */
 class CRM_Extension_System {
 
-  public const DEFAULT_MAX_DEPTH = 4;
+  public const DEFAULT_MAX_DEPTH = 3;
 
   private static $singleton;
 
@@ -119,13 +119,18 @@ class CRM_Extension_System {
         $containers['default'] = $this->getDefaultContainer();
       }
 
-      $containers['civiroot'] = new CRM_Extension_Container_Basic(
-        $this->parameters['civicrm_root'],
-        $this->parameters['resourceBase'],
-        $this->getCache(),
-        'civiroot',
-        $this->parameters['maxDepth']
-      );
+      $civiSubDirs = defined('CIVICRM_TEST')
+        ? ['ext', 'tools', 'tests']
+        : ['ext', 'tools'];
+      foreach ($civiSubDirs as $civiSubDir) {
+        $containers["civicrm_$civiSubDir"] = new CRM_Extension_Container_Basic(
+          CRM_Utils_File::addTrailingSlash($this->parameters['civicrm_root']) . $civiSubDir,
+          CRM_Utils_File::addTrailingSlash($this->parameters['resourceBase'], '/') . $civiSubDir,
+          $this->getCache(),
+          "civicrm_$civiSubDir",
+          $this->parameters['maxDepth']
+        );
+      }
 
       // TODO: CRM_Extension_Container_Basic( /sites/all/modules )
       // TODO: CRM_Extension_Container_Basic( /sites/$domain/modules
-- 
2.25.1