Merge pull request #15623 from seamuslee001/type_check_exceptions

dev/core#560 [REF] Throw exceptions for invalid type errors when aborting
civicrm · Oct 27, 2019 · a393333 · a393333
2 parents 19788b7 + d8bf477
commit a393333
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
@@ -1550,7 +1550,7 @@ public static function composeQuery($query, $params = [], $abort = TRUE) {
           $tr['%' . $key] = $item[0];
         }
         elseif ($abort) {
-          CRM_Core_Error::fatal("{$item[0]} is not of type {$item[1]}");
+          throw new CRM_Core_Exception("{$item[0]} is not of type {$item[1]}");
         }
       }
     }

diff --git a/CRM/Utils/Type.php b/CRM/Utils/Type.php
@@ -376,7 +376,7 @@ public static function escape($data, $type, $abort = TRUE) {
    *
    * @throws \CRM_Core_Exception
    */
-  public static function validate($data, $type, $abort = TRUE, $name = 'One of parameters ', $isThrowException = FALSE) {
+  public static function validate($data, $type, $abort = TRUE, $name = 'One of parameters ', $isThrowException = TRUE) {
 
     $possibleTypes = [
       'Integer',

diff --git a/tests/phpunit/CRM/Contact/BAO/QueryTest.php b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
@@ -898,7 +898,7 @@ public function testContactIDClause() {
     }
     catch (Exception $e) {
       $this->assertEquals(
-        "A fatal error was triggered: One of parameters  (value: foo@example.com) is not of the type Positive",
+        "One of parameters  (value: foo@example.com) is not of the type Positive",
         $e->getMessage()
       );
       $this->assertTrue(TRUE);