Merge tag '3.1.10' of git://github.com/bcit-ci/CodeIgniter into dev

Signed-off-by: Florian Pritz <bluewind@xinu.at>

1 files changed, 18 insertions, 7 deletions

diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 8354d83fd..1c14f4a3e 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,8 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
+ * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @license	https://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
  * @filesource
@@ -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);
+	}
+}