Custom field admin form reform

This overhauls the custom field administration form:
- Gets rid of the difficult-to-use hierarchcal select
- Removes changeFieldType as a separate form
- Allows changing field type on the main form, with improved validation
- Fixes up some metadata
- Improves choosing default values

CRM/Core/BAO/CustomField.php

@@ -157,13 +157,13 @@ public static function bulkSave($bulkParams, $defaults = []) {
    * Fetch object based on array of properties.
    *
    * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
+   *   An assoc array of name/value pairs.
    * @param array $defaults
    *   (reference ) an assoc array to hold the flattened values.
    *
    * @return CRM_Core_DAO_CustomField
    */
-  public static function retrieve(&$params, &$defaults) {
+  public static function retrieve($params, &$defaults) {
     return CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_CustomField', $params, $defaults);
   }
 

CRM/Core/DAO/CustomField.php

@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4ded3c0d1a8e34502a5957ee74c4480a)
+ * (GenCodeChecksum:b74179ea5553c544931562d6aac5641e)
  */
 
 /**
@@ -365,6 +365,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Select',
+            'label' => ts("Data Type"),
           ],
           'pseudoconstant' => [
             'callback' => 'CRM_Core_BAO_CustomField::dataType',
@@ -384,6 +385,10 @@ public static function &fields() {
           'entity' => 'CustomField',
           'bao' => 'CRM_Core_BAO_CustomField',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Select',
+            'label' => ts("Field Input Type"),
+          ],
           'pseudoconstant' => [
             'callback' => 'CRM_Core_SelectValues::customHtmlType',
           ],

CRM/Core/SelectValues.php

@@ -177,7 +177,6 @@ public static function customHtmlType() {
       'RichTextEditor' => ts('Rich Text Editor'),
       'Autocomplete-Select' => ts('Autocomplete-Select'),
       'Link' => ts('Link'),
-      'ContactReference' => ts('Autocomplete-Select'),
     ];
   }
 

CRM/Core/xml/Menu/Admin.xml

@@ -36,11 +36,6 @@
      <title>Custom Field - Move</title>
      <page_callback>CRM_Custom_Form_MoveField</page_callback>
   </item>
-  <item>
-     <path>civicrm/admin/custom/group/field/changetype</path>
-     <title>Custom Field - Change Type</title>
-     <page_callback>CRM_Custom_Form_ChangeFieldType</page_callback>
-  </item>
   <item>
      <path>civicrm/admin/uf/group</path>
      <title>Profiles</title>