Merge pull request #29101 from colemanw/validateSubTypeByEntity

dev/core#4905 - Make internal function private again
civicrm · Jan 26, 2024 · be3c0af · be3c0af
2 parents 3129207 + e7c5a11
commit be3c0af
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
@@ -536,7 +536,7 @@ public static function getTree(
     ];
     if ($subTypes) {
       foreach ($subTypes as $subType) {
-        $filters['extends_entity_column_value'][] = CRM_Core_BAO_CustomGroup::validateSubTypeByEntity($entityType, $subType);
+        $filters['extends_entity_column_value'][] = self::validateSubTypeByEntity($entityType, $subType);
       }
       if (!$onlySubType) {
         $filters['extends_entity_column_value'][] = NULL;
@@ -665,15 +665,13 @@ private static function formatLegacyDbValues(array &$values): void {
    *
    * For all other entities, it doesn't validate except to check the subtype is an integer.
    *
-   * @internal this will be private again soon.
-   *
    * @param string $entityType
    * @param string $subType
    *
    * @return string
    * @throws \CRM_Core_Exception
    */
-  public static function validateSubTypeByEntity($entityType, $subType) {
+  private static function validateSubTypeByEntity($entityType, $subType) {
     $subType = trim($subType, CRM_Core_DAO::VALUE_SEPARATOR);
     if (is_numeric($subType)) {
       return $subType;