From 31f50670deb8e1894ac51cf7b728653827ecfe1c Mon Sep 17 00:00:00 2001
From: Noah Miller <nm@lemnisc.us>
Date: Sun, 3 Dec 2023 23:06:45 -0800
Subject: [PATCH] Fix a tiypo

---
 CRM/Core/BAO/CustomGroup.php                                | 4 ++--
 ext/afform/core/Civi/Afform/Event/AfformEntitySortEvent.php | 2 +-
 tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php           | 2 +-
 tests/phpunit/api/v3/CustomGroupTest.php                    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
index 3ae47793a5..c9ea430fc5 100644
--- a/CRM/Core/BAO/CustomGroup.php
+++ b/CRM/Core/BAO/CustomGroup.php
@@ -60,13 +60,13 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup implements \Civi
       if (is_array($extendsChildType)) {
         foreach ($extendsChildType as $childType) {
           if (!array_key_exists($childType, $registeredSubTypes) && !in_array($childType, $registeredSubTypes, TRUE)) {
-            throw new CRM_Core_Exception('Supplied Sub type is not valid for the specified entitiy');
+            throw new CRM_Core_Exception('Supplied Sub type is not valid for the specified entity');
           }
         }
       }
       else {
         if (!array_key_exists($extendsChildType, $registeredSubTypes) && !in_array($extendsChildType, $registeredSubTypes, TRUE)) {
-          throw new CRM_Core_Exception('Supplied Sub type is not valid for the specified entitiy');
+          throw new CRM_Core_Exception('Supplied Sub type is not valid for the specified entity');
         }
         $extendsChildType = [$extendsChildType];
       }
diff --git a/ext/afform/core/Civi/Afform/Event/AfformEntitySortEvent.php b/ext/afform/core/Civi/Afform/Event/AfformEntitySortEvent.php
index 38f01a6d78..57d5fe4aed 100644
--- a/ext/afform/core/Civi/Afform/Event/AfformEntitySortEvent.php
+++ b/ext/afform/core/Civi/Afform/Event/AfformEntitySortEvent.php
@@ -29,7 +29,7 @@ class AfformEntitySortEvent extends AfformBaseEvent {
     $sorter = new FixedArraySort();
     $formEntities = array_keys($this->getFormDataModel()->getEntities());
     foreach ($formEntities as $entityName) {
-      // Add all dependencies that are the valid name of another entitiy
+      // Add all dependencies that are the valid name of another entity
       $dependencies = array_intersect($this->dependencies[$entityName] ?? [], $formEntities);
       $sorter->add($entityName, $dependencies);
     }
diff --git a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php
index ba2f09d76b..ac7f97442e 100644
--- a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php
+++ b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php
@@ -2411,7 +2411,7 @@ class CRM_Core_BAO_ActionScheduleTest extends CiviUnitTestCase {
    * It 'steals and deletes entities that are part of the 'stock build'.
    *
    * In general this causes weird stuff and is worse that competing functions
-   * like individualCreate() eventCreateUnpaid() or createTestEntitiy().
+   * like individualCreate() eventCreateUnpaid() or createTestEntity().
    *
    * @param $daoName
    * @param array $params
diff --git a/tests/phpunit/api/v3/CustomGroupTest.php b/tests/phpunit/api/v3/CustomGroupTest.php
index 66a38936c4..57ede8415b 100644
--- a/tests/phpunit/api/v3/CustomGroupTest.php
+++ b/tests/phpunit/api/v3/CustomGroupTest.php
@@ -175,7 +175,7 @@ class api_v3_CustomGroupTest extends CiviUnitTestCase {
       'is_active' => 1,
     ];
 
-    $result = $this->callAPIFailure('custom_group', 'create', $params, 'Supplied Sub type is not valid for the specified entitiy');
+    $result = $this->callAPIFailure('custom_group', 'create', $params, 'Supplied Sub type is not valid for the specified entity');
   }
 
   /**
-- 
2.25.1