diff options
author | Andrey Andreev <narf@devilix.net> | 2018-06-01 17:07:34 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2019-01-08 16:46:10 +0100 |
commit | 12ee9843877bf80159d1d89a0e3a4f170e902725 (patch) | |
tree | a8a9dfb5ec1632bceb5fa4842f5f86cff751b4c9 /system | |
parent | c21c0359e1b4d96b1186ca2db78a01c7f38e904d (diff) |
[ci skip] Close #5482
Diffstat (limited to 'system')
-rw-r--r-- | system/helpers/inflector_helper.php | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index bd36c3514..1c14f4a3e 100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php @@ -63,7 +63,7 @@ if ( ! function_exists('singular')) { $result = strval($str); - if ( ! is_countable($result)) + if ( ! word_is_countable($result)) { return $result; } @@ -128,7 +128,7 @@ if ( ! function_exists('plural')) { $result = strval($str); - if ( ! is_countable($result)) + if ( ! word_is_countable($result)) { return $result; } @@ -226,7 +226,7 @@ if ( ! function_exists('humanize')) // -------------------------------------------------------------------- -if ( ! function_exists('is_countable')) +if ( ! function_exists('word_is_countable')) { /** * Checks if the given word has a plural version. @@ -234,7 +234,7 @@ if ( ! function_exists('is_countable')) * @param string $word Word to check * @return bool */ - function is_countable($word) + function word_is_countable($word) { return ! in_array( strtolower($word), @@ -274,3 +274,14 @@ if ( ! function_exists('is_countable')) ); } } + +// -------------------------------------------------------------------- + +if ( ! function_exists('is_countable')) +{ + function is_countable($word) + { + trigger_error('is_countable() is a native PHP function since version 7.3.0; use word_is_countable() instead', E_USER_WARNING); + return word_is_countable($word); + } +} |