projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #16161 from civicrm/5.21
[civicrm-core.git]
/
CRM
/
Utils
/
Type.php
diff --git
a/CRM/Utils/Type.php
b/CRM/Utils/Type.php
index b57ea91540dd41a52eae6b4a5883da15f255967e..54abc84763e947b62494af3c8f3b718c43526f90 100644
(file)
--- a/
CRM/Utils/Type.php
+++ b/
CRM/Utils/Type.php
@@
-213,7
+213,7
@@
class CRM_Utils_Type {
* @param string $type
* The type to verify against.
* @param bool $abort
* @param string $type
* The type to verify against.
* @param bool $abort
- * If TRUE, the operation will
CRM_Core_Error::fatal()
on invalid data.
+ * If TRUE, the operation will
throw an CRM_Core_Exception
on invalid data.
*
* @return mixed
* The data, escaped if necessary.
*
* @return mixed
* The data, escaped if necessary.
@@
-326,17
+326,16
@@
class CRM_Utils_Type {
break;
default:
break;
default:
-
CRM_Core_Error::fatal
(
+
throw new CRM_Core_Exception
(
$type . " is not a recognised (camel cased) data type."
);
$type . " is not a recognised (camel cased) data type."
);
- break;
}
// @todo Use exceptions instead of CRM_Core_Error::fatal().
if ($abort) {
$data = htmlentities($data);
}
// @todo Use exceptions instead of CRM_Core_Error::fatal().
if ($abort) {
$data = htmlentities($data);
-
CRM_Core_Error::fatal
("$data is not of the type $type");
+
throw new CRM_Core_Exception
("$data is not of the type $type");
}
return NULL;
}
}
return NULL;
}