Cleaning up Inflector::singular and Inflector::plural

classes/kohana/inflector.php

@@ -63,7 +63,7 @@ public static function uncountable($str)
 	 * [!!] Special inflections are defined in `config/inflector.php`.
 	 *
 	 * @param   string   word to singularize
-	 * @param   integer  number of things
+	 * @param   integer  count of thing
 	 * @return  string
 	 * @uses    Inflector::uncountable
 	 */
@@ -72,9 +72,9 @@ public static function singular($str, $count = NULL)
 		// Remove garbage
 		$str = strtolower(trim($str));
 
-		if (is_string($count))
+		if ($count !== NULL)
 		{
-			// Convert to integer when using a digit string
+			// Force an integer value, so that === 0 works
 			$count = (int) $count;
 		}
 
@@ -108,10 +108,12 @@ public static function singular($str, $count = NULL)
 		}
 		elseif (preg_match('/[^aeiou]ies$/', $str))
 		{
+			// Replace "ies" with "y"
 			$str = substr($str, 0, -3).'y';
 		}
 		elseif (substr($str, -1) === 's' AND substr($str, -2) !== 'ss')
 		{
+			// Remove singular "s"
 			$str = substr($str, 0, -1);
 		}
 
@@ -132,7 +134,8 @@ public static function singular($str, $count = NULL)
 	 *
 	 * [!!] Special inflections are defined in `config/inflector.php`.
 	 *
-	 * @param   string  word to pluralize
+	 * @param   string   word to pluralize
+	 * @param   integer  count of thing
 	 * @return  string
 	 * @uses    Inflector::uncountable
 	 */
@@ -141,6 +144,11 @@ public static function plural($str, $count = NULL)
 		// Remove garbage
 		$str = strtolower(trim($str));
 
+		if ($count !== NULL)
+		{
+			$count
+		}
+
 		if (is_string($count))
 		{
 			// Convert to integer when using a digit string