projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
476cc43
)
Reduce redundant code in CRM_Utils_Type::validate
author
Coleman Watts
<coleman@civicrm.org>
Tue, 9 Apr 2019 11:04:19 +0000
(07:04 -0400)
committer
Coleman Watts
<coleman@civicrm.org>
Tue, 9 Apr 2019 11:04:19 +0000
(07:04 -0400)
CRM/Utils/Type.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Utils/Type.php
b/CRM/Utils/Type.php
index e2786712a420786e263ea190cd925d0c160516db..ef066db8f0033c887e677f748852d25ed4cdbed0 100644
(file)
--- a/
CRM/Utils/Type.php
+++ b/
CRM/Utils/Type.php
@@
-456,18
+456,6
@@
class CRM_Utils_Type {
}
break;
}
break;
- case 'CommaSeparatedIntegers':
- if (CRM_Utils_Rule::commaSeparatedIntegers($data)) {
- return $data;
- }
- break;
-
- case 'Boolean':
- if (CRM_Utils_Rule::boolean($data)) {
- return $data;
- }
- break;
-
case 'Float':
case 'Money':
if (CRM_Utils_Rule::numeric($data)) {
case 'Float':
case 'Money':
if (CRM_Utils_Rule::numeric($data)) {
@@
-520,47
+508,23
@@
class CRM_Utils_Type {
}
break;
}
break;
- case 'MysqlColumnNameOrAlias':
- if (CRM_Utils_Rule::mysqlColumnNameOrAlias($data)) {
- return $data;
- }
- break;
-
case 'MysqlOrderByDirection':
if (CRM_Utils_Rule::mysqlOrderByDirection($data)) {
return strtolower($data);
}
break;
case 'MysqlOrderByDirection':
if (CRM_Utils_Rule::mysqlOrderByDirection($data)) {
return strtolower($data);
}
break;
- case 'MysqlOrderBy':
- if (CRM_Utils_Rule::mysqlOrderBy($data)) {
- return $data;
- }
- break;
-
case 'ExtensionKey':
if (CRM_Utils_Rule::checkExtensionKeyIsValid($data)) {
return $data;
}
break;
case 'ExtensionKey':
if (CRM_Utils_Rule::checkExtensionKeyIsValid($data)) {
return $data;
}
break;
- case 'Json':
- if (CRM_Utils_Rule::json($data)) {
- return $data;
- }
- break;
-
- case 'Alphanumeric':
- if (CRM_Utils_Rule::alphanumeric($data)) {
- return $data;
- }
- break;
-
- case 'Color':
- if (CRM_Utils_Rule::color($data)) {
+ default:
+ $check = lcfirst($type);
+ if (CRM_Utils_Rule::$check($data)) {
return $data;
}
return $data;
}
- break;
}
if ($abort) {
}
if ($abort) {