Add single/blank support for char case rules

auraphp · Mar 4, 2016 · 67ce515 · 67ce515
1 parent a841aa0
commit 67ce515
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/src/Rule/AbstractCharCase.php b/src/Rule/AbstractCharCase.php
@@ -90,10 +90,15 @@ protected function ucwords($str)
     protected function ucfirst($str)
     {
         $len = $this->strlen($str);
-        $head = $this->substr($str, 0, 1);
-        $tail = $this->substr($str, 1, $len - 1);
-
-        return $this->strtoupper($head) . $tail;
+        if ($len == 0) {
+            return '';
+        }
+        if ($len > 1) {
+            $head = $this->substr($str, 0, 1);
+            $tail = $this->substr($str, 1, $len - 1);
+            return $this->strtoupper($head) . $tail;
+        }
+        return $this->strtoupper($str);
     }
 
     /**
@@ -109,10 +114,17 @@ protected function ucfirst($str)
     protected function lcfirst($str)
     {
         $len = $this->strlen($str);
-        $head = $this->substr($str, 0, 1);
-        $tail = $this->substr($str, 1, $len - 1);
-
-        return $this->strtolower($head) . $tail;
+        if ($len == 0) {
+            // empty string
+            return '';
+        }
+        if ($len > 1) {
+            // more than a single character
+            $head = $this->substr($str, 0, 1);
+            $tail = $this->substr($str, 1, $len - 1);
+            return $this->strtolower($head) . $tail;
+        }
+        return $this->strtolower($str);
     }
 
 }
diff --git a/tests/Rule/Sanitize/LowercaseFirstTest.php b/tests/Rule/Sanitize/LowercaseFirstTest.php
@@ -7,6 +7,7 @@ public function providerTo()
     {
         return array(
             array(array(), false, array()),
+            array('', true, ''),
             array('A', true, 'a'),
             array('AbCd', true, 'abCd'),
             array('ABCDEF', true, 'aBCDEF'),

diff --git a/tests/Rule/Sanitize/LowercaseTest.php b/tests/Rule/Sanitize/LowercaseTest.php
@@ -7,6 +7,7 @@ public function providerTo()
     {
         return array(
             array(array(), false, array()),
+            array('', true, ''),
             array('A', true, 'a'),
             array('AbCd', true, 'abcd'),
             array('ABCDEF', true, 'abcdef'),

diff --git a/tests/Rule/Sanitize/UppercaseFirstTest.php b/tests/Rule/Sanitize/UppercaseFirstTest.php
@@ -7,6 +7,7 @@ public function providerTo()
     {
         return array(
             array(array(), false, array()),
+            array('', true, ''),
             array('a', true, 'A'),
             array('Ab cd', true, 'Ab cd'),
             array('ABC DEF', true, 'ABC DEF'),

diff --git a/tests/Rule/Sanitize/UppercaseTest.php b/tests/Rule/Sanitize/UppercaseTest.php
@@ -7,6 +7,7 @@ public function providerTo()
     {
         return array(
             array(array(), false, array()),
+            array('', true, ''),
             array('a', true, 'A'),
             array('Ab cd', true, 'AB CD'),
             array('ABC DEF', true, 'ABC DEF'),