Added missing tests for certain classes.

titon · Dec 29, 2014 · 165b7b2 · 165b7b2
1 parent 69d7df7
commit 165b7b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/Inflector.hh b/Inflector.hh
@@ -43,23 +43,18 @@ class Inflector {
     }
 
     /**
-     * Inflect a word for a filename. Studly cased and capitalized.
+     * Inflect a word for a filename. Remove an extension if it exists, and add a new extension.
      *
      * @param string $string
      * @param string $ext
-     * @param bool $capitalize
      * @return string
      */
-    public static function fileName(string $string, string $ext = 'php', bool $capitalize = true): string {
+    public static function fileName(string $string, string $ext = 'php'): string {
         if (mb_strpos($string, '.') !== false) {
             $string = mb_substr($string, 0, mb_strrpos($string, '.'));
         }
 
-        $path = static::camelCase($string);
-
-        if (!$capitalize) {
-            $path = lcfirst($path);
-        }
+        $path = static::hyphenate($string);
 
         if (mb_substr($path, -(mb_strlen($ext) + 1)) !== '.' . $ext) {
             $path .= '.' . $ext;

diff --git a/bootstrap.hh b/bootstrap.hh
@@ -272,8 +272,8 @@ function camel_case(string $string): string {
 /**
  * @see Titon\Utility\Inflector::fileName()
  */
-function file_name(string $string): string {
-    return Inflector::fileName($string);
+function file_name(string $string, string $ext = 'php'): string {
+    return Inflector::fileName($string, $ext);
 }
 
 /**