dev/core#2556 Rename extension org.civicrm.search -> org.civicrm.search_kit
authorColeman Watts <coleman@civicrm.org>
Thu, 22 Apr 2021 15:41:58 +0000 (11:41 -0400)
committerColeman Watts <coleman@civicrm.org>
Thu, 22 Apr 2021 16:09:32 +0000 (12:09 -0400)
This avoids a namespace conflict in drupal 7, and is generally more descriptive
See https://lab.civicrm.org/dev/core/-/issues/2556

110 files changed:
.gitignore
CRM/Upgrade/Incremental/sql/5.38.alpha1.mysql.tpl
distmaker/dists/common.sh
ext/search_kit/CRM/Search/BAO/SearchDisplay.php [moved from ext/search/CRM/Search/BAO/SearchDisplay.php with 100% similarity]
ext/search_kit/CRM/Search/DAO/SearchDisplay.php [moved from ext/search/CRM/Search/DAO/SearchDisplay.php with 98% similarity]
ext/search_kit/CRM/Search/Page/Admin.php [moved from ext/search/CRM/Search/Page/Admin.php with 100% similarity]
ext/search_kit/CRM/Search/Page/Search.php [moved from ext/search/CRM/Search/Page/Search.php with 100% similarity]
ext/search_kit/CRM/Search/Upgrader.php [moved from ext/search/CRM/Search/Upgrader.php with 100% similarity]
ext/search_kit/CRM/Search/Upgrader/Base.php [moved from ext/search/CRM/Search/Upgrader/Base.php with 100% similarity]
ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php [moved from ext/search/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php with 100% similarity]
ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php [moved from ext/search/Civi/Api4/Action/SearchDisplay/Run.php with 100% similarity]
ext/search_kit/Civi/Api4/SearchDisplay.php [moved from ext/search/Civi/Api4/SearchDisplay.php with 100% similarity]
ext/search_kit/Civi/Api4/Service/Spec/Provider/SearchDisplayCreationSpecProvider.php [moved from ext/search/Civi/Api4/Service/Spec/Provider/SearchDisplayCreationSpecProvider.php with 100% similarity]
ext/search_kit/Civi/Search/Actions.php [moved from ext/search/Civi/Search/Actions.php with 100% similarity]
ext/search_kit/Civi/Search/Admin.php [moved from ext/search/Civi/Search/Admin.php with 100% similarity]
ext/search_kit/Civi/Search/AfformSearchMetadataInjector.php [moved from ext/search/Civi/Search/AfformSearchMetadataInjector.php with 100% similarity]
ext/search_kit/Civi/Search/Display.php [moved from ext/search/Civi/Search/Display.php with 100% similarity]
ext/search_kit/README.md [moved from ext/search/README.md with 100% similarity]
ext/search_kit/ang/crmSearchActions.ang.php [moved from ext/search/ang/crmSearchActions.ang.php with 100% similarity]
ext/search_kit/ang/crmSearchActions.module.js [moved from ext/search/ang/crmSearchActions.module.js with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchActionDelete.ctrl.js [moved from ext/search/ang/crmSearchActions/crmSearchActionDelete.ctrl.js with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchActionDelete.html [moved from ext/search/ang/crmSearchActions/crmSearchActionDelete.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js [moved from ext/search/ang/crmSearchActions/crmSearchActionUpdate.ctrl.js with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchActionUpdate.html [moved from ext/search/ang/crmSearchActions/crmSearchActionUpdate.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchActions.component.js [moved from ext/search/ang/crmSearchActions/crmSearchActions.component.js with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchActions.html [moved from ext/search/ang/crmSearchActions/crmSearchActions.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchBatchRunner.component.js [moved from ext/search/ang/crmSearchActions/crmSearchBatchRunner.component.js with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchBatchRunner.html [moved from ext/search/ang/crmSearchActions/crmSearchBatchRunner.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/boolean.html [moved from ext/search/ang/crmSearchActions/crmSearchInput/boolean.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/crmMultiSelectDate.directive.js [moved from ext/search/ang/crmSearchActions/crmSearchInput/crmMultiSelectDate.directive.js with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js [moved from ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.component.js with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/crmSearchInput.html [moved from ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInput.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js [moved from ext/search/ang/crmSearchActions/crmSearchInput/crmSearchInputVal.component.js with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/date.html [moved from ext/search/ang/crmSearchActions/crmSearchInput/date.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/entityRef.html [moved from ext/search/ang/crmSearchActions/crmSearchInput/entityRef.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/float.html [moved from ext/search/ang/crmSearchActions/crmSearchInput/float.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/integer.html [moved from ext/search/ang/crmSearchActions/crmSearchInput/integer.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/select.html [moved from ext/search/ang/crmSearchActions/crmSearchInput/select.html with 100% similarity]
ext/search_kit/ang/crmSearchActions/crmSearchInput/text.html [moved from ext/search/ang/crmSearchActions/crmSearchInput/text.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin.ang.php [moved from ext/search/ang/crmSearchAdmin.ang.php with 100% similarity]
ext/search_kit/ang/crmSearchAdmin.module.js [moved from ext/search/ang/crmSearchAdmin.module.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/compose/controls.html [moved from ext/search/ang/crmSearchAdmin/compose/controls.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/compose/criteria.html [moved from ext/search/ang/crmSearchAdmin/compose/criteria.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/compose/debug.html [moved from ext/search/ang/crmSearchAdmin/compose/debug.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/compose/pager.html [moved from ext/search/ang/crmSearchAdmin/compose/pager.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/compose/results.html [moved from ext/search/ang/crmSearchAdmin/compose/results.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js [moved from ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html [moved from ext/search/ang/crmSearchAdmin/crmSearchAdmin.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js [moved from ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html [moved from ext/search/ang/crmSearchAdmin/crmSearchAdminDisplay.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html [moved from ext/search/ang/crmSearchAdmin/crmSearchAdminDisplaySort.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js [moved from ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.component.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkGroup.html [moved from ext/search/ang/crmSearchAdmin/crmSearchAdminLinkGroup.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js [moved from ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.component.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminLinkSelect.html [moved from ext/search/ang/crmSearchAdmin/crmSearchAdminLinkSelect.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js [moved from ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.component.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html [moved from ext/search/ang/crmSearchAdmin/crmSearchAdminTokenSelect.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchClause.component.js [moved from ext/search/ang/crmSearchAdmin/crmSearchClause.component.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchClause.html [moved from ext/search/ang/crmSearchAdmin/crmSearchClause.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchFunction.component.js [moved from ext/search/ang/crmSearchAdmin/crmSearchFunction.component.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/crmSearchFunction.html [moved from ext/search/ang/crmSearchAdmin/crmSearchFunction.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/displays/colType/buttons.html [moved from ext/search/ang/crmSearchAdmin/displays/colType/buttons.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html [moved from ext/search/ang/crmSearchAdmin/displays/colType/field.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/displays/colType/links.html [moved from ext/search/ang/crmSearchAdmin/displays/colType/links.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/displays/colType/menu.html [moved from ext/search/ang/crmSearchAdmin/displays/colType/menu.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/displays/common/addColMenu.html [moved from ext/search/ang/crmSearchAdmin/displays/common/addColMenu.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js [moved from ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.component.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayList.html [moved from ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayList.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js [moved from ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.component.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html [moved from ext/search/ang/crmSearchAdmin/displays/searchAdminDisplayTable.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/group.html [moved from ext/search/ang/crmSearchAdmin/group.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/searchList.controller.js [moved from ext/search/ang/crmSearchAdmin/searchList.controller.js with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/searchList.html [moved from ext/search/ang/crmSearchAdmin/searchList.html with 100% similarity]
ext/search_kit/ang/crmSearchAdmin/tabs.html [moved from ext/search/ang/crmSearchAdmin/tabs.html with 100% similarity]
ext/search_kit/ang/crmSearchDisplay.ang.php [moved from ext/search/ang/crmSearchDisplay.ang.php with 100% similarity]
ext/search_kit/ang/crmSearchDisplay.module.js [moved from ext/search/ang/crmSearchDisplay.module.js with 100% similarity]
ext/search_kit/ang/crmSearchDisplay/Pager.html [moved from ext/search/ang/crmSearchDisplay/Pager.html with 100% similarity]
ext/search_kit/ang/crmSearchDisplay/colType/buttons.html [moved from ext/search/ang/crmSearchDisplay/colType/buttons.html with 100% similarity]
ext/search_kit/ang/crmSearchDisplay/colType/field.html [moved from ext/search/ang/crmSearchDisplay/colType/field.html with 100% similarity]
ext/search_kit/ang/crmSearchDisplay/colType/links.html [moved from ext/search/ang/crmSearchDisplay/colType/links.html with 100% similarity]
ext/search_kit/ang/crmSearchDisplay/colType/menu.html [moved from ext/search/ang/crmSearchDisplay/colType/menu.html with 100% similarity]
ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js [moved from ext/search/ang/crmSearchDisplay/crmSearchDisplayEditable.component.js with 100% similarity]
ext/search_kit/ang/crmSearchDisplay/crmSearchDisplayEditable.html [moved from ext/search/ang/crmSearchDisplay/crmSearchDisplayEditable.html with 100% similarity]
ext/search_kit/ang/crmSearchDisplayList.ang.php [moved from ext/search/ang/crmSearchDisplayList.ang.php with 100% similarity]
ext/search_kit/ang/crmSearchDisplayList.module.js [moved from ext/search/ang/crmSearchDisplayList.module.js with 100% similarity]
ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.component.js [moved from ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.component.js with 100% similarity]
ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayList.html [moved from ext/search/ang/crmSearchDisplayList/crmSearchDisplayList.html with 100% similarity]
ext/search_kit/ang/crmSearchDisplayList/crmSearchDisplayListItems.html [moved from ext/search/ang/crmSearchDisplayList/crmSearchDisplayListItems.html with 100% similarity]
ext/search_kit/ang/crmSearchDisplayTable.ang.php [moved from ext/search/ang/crmSearchDisplayTable.ang.php with 100% similarity]
ext/search_kit/ang/crmSearchDisplayTable.module.js [moved from ext/search/ang/crmSearchDisplayTable.module.js with 100% similarity]
ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js [moved from ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.component.js with 100% similarity]
ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTable.html [moved from ext/search/ang/crmSearchDisplayTable/crmSearchDisplayTable.html with 100% similarity]
ext/search_kit/ang/crmSearchPage.ang.php [moved from ext/search/ang/crmSearchPage.ang.php with 100% similarity]
ext/search_kit/ang/crmSearchPage.module.js [moved from ext/search/ang/crmSearchPage.module.js with 100% similarity]
ext/search_kit/css/crmSearchActions.css [moved from ext/search/css/crmSearchActions.css with 100% similarity]
ext/search_kit/css/crmSearchAdmin.css [moved from ext/search/css/crmSearchAdmin.css with 100% similarity]
ext/search_kit/info.xml [moved from ext/search/info.xml with 92% similarity]
ext/search_kit/managed/SearchDisplayType.mgd.php [moved from ext/search/managed/SearchDisplayType.mgd.php with 100% similarity]
ext/search_kit/phpunit.xml.dist [moved from ext/search/phpunit.xml.dist with 100% similarity]
ext/search_kit/search_kit.civix.php [moved from ext/search/search.civix.php with 81% similarity]
ext/search_kit/search_kit.php [moved from ext/search/search.php with 66% similarity]
ext/search_kit/sql/auto_install.sql [moved from ext/search/sql/auto_install.sql with 96% similarity]
ext/search_kit/sql/auto_uninstall.sql [moved from ext/search/sql/auto_uninstall.sql with 93% similarity]
ext/search_kit/templates/CRM/Search/Page/Admin.tpl [moved from ext/search/templates/CRM/Search/Page/Admin.tpl with 100% similarity]
ext/search_kit/templates/CRM/Search/Page/Search.tpl [moved from ext/search/templates/CRM/Search/Page/Search.tpl with 100% similarity]
ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php [moved from ext/search/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php with 100% similarity]
ext/search_kit/tests/phpunit/bootstrap.php [moved from ext/search/tests/phpunit/bootstrap.php with 100% similarity]
ext/search_kit/xml/Menu/search_kit.xml [moved from ext/search/xml/Menu/search.xml with 100% similarity]
ext/search_kit/xml/schema/CRM/Search/SearchDisplay.entityType.php [moved from ext/search/xml/schema/CRM/Search/SearchDisplay.entityType.php with 100% similarity]
ext/search_kit/xml/schema/CRM/Search/SearchDisplay.xml [moved from ext/search/xml/schema/CRM/Search/SearchDisplay.xml with 100% similarity]

index 3ce9e373ceba3160f03940b3cf2f23acbfdc4aea..83bcf4a5274c7e2d96b012d22ca6d18947142a31 100644 (file)
@@ -12,7 +12,7 @@
 /ext/greenwich/dist
 /ext/greenwich/extern
 !/ext/oauth-client
-!/ext/search
+!/ext/search_kit
 !/ext/financialacls
 !/ext/contributioncancelactions
 !/ext/recaptcha
index 4e389986d498fbe357bb49158c250ebf2bdb531b..236abd7691e47c0edfa2bcc578dc9ef01b21d373 100644 (file)
@@ -1,3 +1,11 @@
 {* file to handle db changes in 5.38.alpha1 during upgrade *}
 
 ALTER TABLE civicrm_queue_item MODIFY data LONGTEXT;
+
+UPDATE civicrm_extension
+SET full_name = 'org.civicrm.search_kit', name = 'search_kit', file = 'search_kit'
+WHERE full_name = 'org.civicrm.search';
+
+UPDATE civicrm_managed
+SET module = 'org.civicrm.search_kit'
+WHERE module = 'org.civicrm.search';
index 722332f2f2c02b89840b9e5ad683bc9ac2c59e69..2c204433e110d37c46f8ddad78a6bea752dbbb1d 100644 (file)
@@ -118,7 +118,7 @@ function dm_install_coreext() {
 ## Get a list of default/core extension directories (space-delimited)
 ## reldirs=$(dm_core_exts)
 function dm_core_exts() {
-  echo ext/search
+  echo ext/search_kit
   echo ext/sequentialcreditnotes
   echo ext/flexmailer
   echo ext/eventcart
similarity index 98%
rename from ext/search/CRM/Search/DAO/SearchDisplay.php
rename to ext/search_kit/CRM/Search/DAO/SearchDisplay.php
index 271b36feb3872106bbf1a8a543e687932e9b8888..e4dd814bfb94d53cbefc92e094a20623b4d93967 100644 (file)
@@ -4,9 +4,9 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  *
- * Generated from org.civicrm.search/xml/schema/CRM/Search/SearchDisplay.xml
+ * Generated from org.civicrm.search_kit/xml/schema/CRM/Search/SearchDisplay.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ac28cede0407e2e1bf2273b7ca6421d4)
+ * (GenCodeChecksum:6042d1e2bee9eaed4c3a7c59c34ad224)
  */
 use CRM_Search_ExtensionUtil as E;
 
@@ -125,6 +125,7 @@ class CRM_Search_DAO_SearchDisplay extends CRM_Core_DAO {
           'entity' => 'SearchDisplay',
           'bao' => 'CRM_Search_DAO_SearchDisplay',
           'localizable' => 0,
+          'readonly' => TRUE,
           'add' => '1.0',
         ],
         'name' => [
similarity index 92%
rename from ext/search/info.xml
rename to ext/search_kit/info.xml
index aa85932f44112ad5e06a78b32656fad6b9528a72..6519587974e000e5d138fbc2ce34494c604d9fbd 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<extension key="org.civicrm.search" type="module">
-  <file>search</file>
+<extension key="org.civicrm.search_kit" type="module">
+  <file>search_kit</file>
   <name>Search Kit</name>
   <description>Create searches for a wide variety of CiviCRM entities</description>
   <license>AGPL-3.0</license>
similarity index 81%
rename from ext/search/search.civix.php
rename to ext/search_kit/search_kit.civix.php
index 7ae23cc7de4f1d0330c86f1819f0db0bb4cd7cde..b8d250482699de088ebc53ddfabad305b2be779a 100644 (file)
@@ -7,8 +7,8 @@
  * extension.
  */
 class CRM_Search_ExtensionUtil {
-  const SHORT_NAME = 'search';
-  const LONG_NAME = 'org.civicrm.search';
+  const SHORT_NAME = 'search_kit';
+  const LONG_NAME = 'org.civicrm.search_kit';
   const CLASS_PREFIX = 'CRM_Search';
 
   /**
@@ -84,7 +84,7 @@ use CRM_Search_ExtensionUtil as E;
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
  */
-function _search_civix_civicrm_config(&$config = NULL) {
+function _search_kit_civix_civicrm_config(&$config = NULL) {
   static $configured = FALSE;
   if ($configured) {
     return;
@@ -114,8 +114,8 @@ function _search_civix_civicrm_config(&$config = NULL) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
  */
-function _search_civix_civicrm_xmlMenu(&$files) {
-  foreach (_search_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
+function _search_kit_civix_civicrm_xmlMenu(&$files) {
+  foreach (_search_kit_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
     $files[] = $file;
   }
 }
@@ -125,9 +125,9 @@ function _search_civix_civicrm_xmlMenu(&$files) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
  */
-function _search_civix_civicrm_install() {
-  _search_civix_civicrm_config();
-  if ($upgrader = _search_civix_upgrader()) {
+function _search_kit_civix_civicrm_install() {
+  _search_kit_civix_civicrm_config();
+  if ($upgrader = _search_kit_civix_upgrader()) {
     $upgrader->onInstall();
   }
 }
@@ -137,9 +137,9 @@ function _search_civix_civicrm_install() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
  */
-function _search_civix_civicrm_postInstall() {
-  _search_civix_civicrm_config();
-  if ($upgrader = _search_civix_upgrader()) {
+function _search_kit_civix_civicrm_postInstall() {
+  _search_kit_civix_civicrm_config();
+  if ($upgrader = _search_kit_civix_upgrader()) {
     if (is_callable([$upgrader, 'onPostInstall'])) {
       $upgrader->onPostInstall();
     }
@@ -151,9 +151,9 @@ function _search_civix_civicrm_postInstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
  */
-function _search_civix_civicrm_uninstall() {
-  _search_civix_civicrm_config();
-  if ($upgrader = _search_civix_upgrader()) {
+function _search_kit_civix_civicrm_uninstall() {
+  _search_kit_civix_civicrm_config();
+  if ($upgrader = _search_kit_civix_upgrader()) {
     $upgrader->onUninstall();
   }
 }
@@ -163,9 +163,9 @@ function _search_civix_civicrm_uninstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
-function _search_civix_civicrm_enable() {
-  _search_civix_civicrm_config();
-  if ($upgrader = _search_civix_upgrader()) {
+function _search_kit_civix_civicrm_enable() {
+  _search_kit_civix_civicrm_config();
+  if ($upgrader = _search_kit_civix_upgrader()) {
     if (is_callable([$upgrader, 'onEnable'])) {
       $upgrader->onEnable();
     }
@@ -178,9 +178,9 @@ function _search_civix_civicrm_enable() {
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
  * @return mixed
  */
-function _search_civix_civicrm_disable() {
-  _search_civix_civicrm_config();
-  if ($upgrader = _search_civix_upgrader()) {
+function _search_kit_civix_civicrm_disable() {
+  _search_kit_civix_civicrm_config();
+  if ($upgrader = _search_kit_civix_upgrader()) {
     if (is_callable([$upgrader, 'onDisable'])) {
       $upgrader->onDisable();
     }
@@ -199,8 +199,8 @@ function _search_civix_civicrm_disable() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
  */
-function _search_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
-  if ($upgrader = _search_civix_upgrader()) {
+function _search_kit_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  if ($upgrader = _search_kit_civix_upgrader()) {
     return $upgrader->onUpgrade($op, $queue);
   }
 }
@@ -208,7 +208,7 @@ function _search_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
 /**
  * @return CRM_Search_Upgrader
  */
-function _search_civix_upgrader() {
+function _search_kit_civix_upgrader() {
   if (!file_exists(__DIR__ . '/CRM/Search/Upgrader.php')) {
     return NULL;
   }
@@ -228,7 +228,7 @@ function _search_civix_upgrader() {
  *
  * @return array
  */
-function _search_civix_find_files($dir, $pattern) {
+function _search_kit_civix_find_files($dir, $pattern) {
   if (is_callable(['CRM_Utils_File', 'findFiles'])) {
     return CRM_Utils_File::findFiles($dir, $pattern);
   }
@@ -237,7 +237,7 @@ function _search_civix_find_files($dir, $pattern) {
   $result = [];
   while (!empty($todos)) {
     $subdir = array_shift($todos);
-    foreach (_search_civix_glob("$subdir/$pattern") as $match) {
+    foreach (_search_kit_civix_glob("$subdir/$pattern") as $match) {
       if (!is_dir($match)) {
         $result[] = $match;
       }
@@ -264,8 +264,8 @@ function _search_civix_find_files($dir, $pattern) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
  */
-function _search_civix_civicrm_managed(&$entities) {
-  $mgdFiles = _search_civix_find_files(__DIR__, '*.mgd.php');
+function _search_kit_civix_civicrm_managed(&$entities) {
+  $mgdFiles = _search_kit_civix_find_files(__DIR__, '*.mgd.php');
   sort($mgdFiles);
   foreach ($mgdFiles as $file) {
     $es = include $file;
@@ -290,12 +290,12 @@ function _search_civix_civicrm_managed(&$entities) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
  */
-function _search_civix_civicrm_caseTypes(&$caseTypes) {
+function _search_kit_civix_civicrm_caseTypes(&$caseTypes) {
   if (!is_dir(__DIR__ . '/xml/case')) {
     return;
   }
 
-  foreach (_search_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) {
+  foreach (_search_kit_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) {
     $name = preg_replace('/\.xml$/', '', basename($file));
     if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
       $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
@@ -318,12 +318,12 @@ function _search_civix_civicrm_caseTypes(&$caseTypes) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
  */
-function _search_civix_civicrm_angularModules(&$angularModules) {
+function _search_kit_civix_civicrm_angularModules(&$angularModules) {
   if (!is_dir(__DIR__ . '/ang')) {
     return;
   }
 
-  $files = _search_civix_glob(__DIR__ . '/ang/*.ang.php');
+  $files = _search_kit_civix_glob(__DIR__ . '/ang/*.ang.php');
   foreach ($files as $file) {
     $name = preg_replace(':\.ang\.php$:', '', basename($file));
     $module = include $file;
@@ -339,8 +339,8 @@ function _search_civix_civicrm_angularModules(&$angularModules) {
  *
  * Find any and return any files matching "*.theme.php"
  */
-function _search_civix_civicrm_themes(&$themes) {
-  $files = _search_civix_glob(__DIR__ . '/*.theme.php');
+function _search_kit_civix_civicrm_themes(&$themes) {
+  $files = _search_kit_civix_glob(__DIR__ . '/*.theme.php');
   foreach ($files as $file) {
     $themeMeta = include $file;
     if (empty($themeMeta['name'])) {
@@ -366,7 +366,7 @@ function _search_civix_civicrm_themes(&$themes) {
  *
  * @return array
  */
-function _search_civix_glob($pattern) {
+function _search_kit_civix_glob($pattern) {
   $result = glob($pattern);
   return is_array($result) ? $result : [];
 }
@@ -382,7 +382,7 @@ function _search_civix_glob($pattern) {
  *
  * @return bool
  */
-function _search_civix_insert_navigation_menu(&$menu, $path, $item) {
+function _search_kit_civix_insert_navigation_menu(&$menu, $path, $item) {
   // If we are done going down the path, insert menu
   if (empty($path)) {
     $menu[] = [
@@ -403,7 +403,7 @@ function _search_civix_insert_navigation_menu(&$menu, $path, $item) {
         if (!isset($entry['child'])) {
           $entry['child'] = [];
         }
-        $found = _search_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
+        $found = _search_kit_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
       }
     }
     return $found;
@@ -413,9 +413,9 @@ function _search_civix_insert_navigation_menu(&$menu, $path, $item) {
 /**
  * (Delegated) Implements hook_civicrm_navigationMenu().
  */
-function _search_civix_navigationMenu(&$nodes) {
+function _search_kit_civix_navigationMenu(&$nodes) {
   if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
-    _search_civix_fixNavigationMenu($nodes);
+    _search_kit_civix_fixNavigationMenu($nodes);
   }
 }
 
@@ -423,17 +423,17 @@ function _search_civix_navigationMenu(&$nodes) {
  * Given a navigation menu, generate navIDs for any items which are
  * missing them.
  */
-function _search_civix_fixNavigationMenu(&$nodes) {
+function _search_kit_civix_fixNavigationMenu(&$nodes) {
   $maxNavID = 1;
   array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
     if ($key === 'navID') {
       $maxNavID = max($maxNavID, $item);
     }
   });
-  _search_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+  _search_kit_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
 }
 
-function _search_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) {
+function _search_kit_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) {
   $origKeys = array_keys($nodes);
   foreach ($origKeys as $origKey) {
     if (!isset($nodes[$origKey]['attributes']['parentID']) && $parentID !== NULL) {
@@ -448,7 +448,7 @@ function _search_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) {
       $origKey = $newKey;
     }
     if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) {
-      _search_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+      _search_kit_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
     }
   }
 }
@@ -458,7 +458,7 @@ function _search_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
  */
-function _search_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+function _search_kit_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
   $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
   if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) {
     $metaDataFolders[] = $settingsDir;
@@ -472,7 +472,7 @@ function _search_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
-function _search_civix_civicrm_entityTypes(&$entityTypes) {
+function _search_kit_civix_civicrm_entityTypes(&$entityTypes) {
   $entityTypes = array_merge($entityTypes, [
     'CRM_Search_DAO_SearchDisplay' => [
       'name' => 'SearchDisplay',
similarity index 66%
rename from ext/search/search.php
rename to ext/search_kit/search_kit.php
index 6a1f4d2ed61bdc26b280d1cf48fc4624bf1cc9ff..170a4a55e0fd6f370bb726ef6ace0f9ef443f945 100644 (file)
@@ -1,14 +1,14 @@
 <?php
 
-require_once 'search.civix.php';
+require_once 'search_kit.civix.php';
 
 /**
  * Implements hook_civicrm_config().
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config/
  */
-function search_civicrm_config(&$config) {
-  _search_civix_civicrm_config($config);
+function search_kit_civicrm_config(&$config) {
+  _search_kit_civix_civicrm_config($config);
   Civi::dispatcher()->addListener('hook_civicrm_alterAngular', ['\Civi\Search\AfformSearchMetadataInjector', 'preprocess'], 1000);
 }
 
@@ -17,8 +17,8 @@ function search_civicrm_config(&$config) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
  */
-function search_civicrm_xmlMenu(&$files) {
-  _search_civix_civicrm_xmlMenu($files);
+function search_kit_civicrm_xmlMenu(&$files) {
+  _search_kit_civix_civicrm_xmlMenu($files);
 }
 
 /**
@@ -29,8 +29,8 @@ function search_civicrm_xmlMenu(&$files) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
  */
-function search_civicrm_managed(&$entities) {
-  _search_civix_civicrm_managed($entities);
+function search_kit_civicrm_managed(&$entities) {
+  _search_kit_civix_civicrm_managed($entities);
 }
 
 /**
@@ -43,8 +43,8 @@ function search_civicrm_managed(&$entities) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
  */
-function search_civicrm_angularModules(&$angularModules) {
-  _search_civix_civicrm_angularModules($angularModules);
+function search_kit_civicrm_angularModules(&$angularModules) {
+  _search_kit_civix_civicrm_angularModules($angularModules);
 }
 
 /**
@@ -52,8 +52,8 @@ function search_civicrm_angularModules(&$angularModules) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
  */
-function search_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
-  _search_civix_civicrm_alterSettingsFolders($metaDataFolders);
+function search_kit_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  _search_kit_civix_civicrm_alterSettingsFolders($metaDataFolders);
 }
 
 /**
@@ -63,21 +63,21 @@ function search_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
-function search_civicrm_entityTypes(&$entityTypes) {
-  _search_civix_civicrm_entityTypes($entityTypes);
+function search_kit_civicrm_entityTypes(&$entityTypes) {
+  _search_kit_civix_civicrm_entityTypes($entityTypes);
 }
 
 /**
  * Implements hook_civicrm_themes().
  */
-function search_civicrm_themes(&$themes) {
-  _search_civix_civicrm_themes($themes);
+function search_kit_civicrm_themes(&$themes) {
+  _search_kit_civix_civicrm_themes($themes);
 }
 
 /**
  * Implements hook_civicrm_pre().
  */
-function search_civicrm_pre($op, $entity, $id, &$params) {
+function search_kit_civicrm_pre($op, $entity, $id, &$params) {
   // Supply default name/label when creating new SearchDisplay
   if ($entity === 'SearchDisplay' && $op === 'create') {
     if (empty($params['label'])) {
similarity index 96%
rename from ext/search/sql/auto_install.sql
rename to ext/search_kit/sql/auto_install.sql
index 03d97ca2e8c228c49b95969199ab257092643e96..3a4deb2b66308508096ef1a3b7efa13d29044981 100644 (file)
@@ -10,7 +10,6 @@
 -- DO NOT EDIT.  Generated by CRM_Core_CodeGen
 --
 
-
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC. All rights reserved.                        |
 -- |                                                                    |
@@ -24,7 +23,7 @@
 --
 -- /*******************************************************
 -- *
--- * Clean up the exisiting tables
+-- * Clean up the existing tables
 -- *
 -- *******************************************************/
 
@@ -54,16 +53,14 @@ CREATE TABLE `civicrm_search_display` (
      `label` varchar(255) NOT NULL   COMMENT 'Label for identifying search display to administrators',
      `saved_search_id` int unsigned NOT NULL   COMMENT 'FK to saved search table.',
      `type` varchar(128) NOT NULL   COMMENT 'Type of display',
-     `settings` text   DEFAULT NULL COMMENT 'Configuration data for the search display' 
+     `settings` text   DEFAULT NULL COMMENT 'Configuration data for the search display'
 ,
         PRIMARY KEY (`id`)
+
     ,     UNIQUE INDEX `UI_saved_search__id_name`(
         saved_search_id
       , name
   )
-  
-,          CONSTRAINT FK_civicrm_search_display_saved_search_id FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE CASCADE  
-) ROW_FORMAT=DYNAMIC    ;
 
+,          CONSTRAINT FK_civicrm_search_display_saved_search_id FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE CASCADE
+) ROW_FORMAT=DYNAMIC    ;
similarity index 93%
rename from ext/search/sql/auto_uninstall.sql
rename to ext/search_kit/sql/auto_uninstall.sql
index 7fc5f6b8f2ed7fd52b055354c7346e5b66c97325..ff5a74dc51e711d951ffaea55aeab8f4c2ef4a8b 100644 (file)
@@ -11,7 +11,7 @@
 --
 -- /*******************************************************
 -- *
--- * Clean up the exisiting tables
+-- * Clean up the existing tables
 -- *
 -- *******************************************************/