Fixed WordWrap bugs in Zend_Text_Multibyte

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24499 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Text/MultiByte.php

@@ -39,78 +39,56 @@ class Zend_Text_MultiByte
      * @param  string  $charset
      * @return string
      */
-    public static function wordWrap($string, $width = 75, $break = "\n", $cut = false, $charset = 'UTF-8')
+    public static function wordWrap($string, $width = 75, $break = "\n", $cut = false, $charset = 'utf-8')
     {
-        $result     = array();
-        $breakWidth = iconv_strlen($break, $charset);
-
-        while (($stringLength = iconv_strlen($string, $charset)) > 0) {
-            $breakPos = iconv_strpos($string, $break, 0, $charset);
-
-            if ($breakPos !== false && $breakPos < $width) {
-                if ($breakPos === $stringLength - $breakWidth) {
-                    $subString = $string;
-                    $cutLength = null;
-                } else {
-                    $subString = iconv_substr($string, 0, $breakPos, $charset);
-                    $cutLength = $breakPos + $breakWidth;
-                }
+        $stringWidth = iconv_strlen($string, $charset);
+        $breakWidth  = iconv_strlen($break, $charset);
+        
+        if (strlen($string) === 0) {
+            return '';
+        } elseif ($breakWidth === null) {
+            throw new Zend_Text_Exception('Break string cannot be empty');
+        } elseif ($width === 0 && $cut) {
+            throw new Zend_Text_Exception('Can\'t force cut when width is zero');
+        }
+        
+        $result    = '';
+        $lastStart = $lastSpace = 0;
+        
+        for ($current = 0; $current < $stringWidth; $current++) {
+            $char = iconv_substr($string, $current, 1, $charset);
+            
+            if ($breakWidth === 1) {
+                $possibleBreak = $char;
             } else {
-                $subString = iconv_substr($string, 0, $width, $charset);
-
-                if ($subString === $string) {
-                    $cutLength = null;
-                } else {
-                    $nextChar = iconv_substr($string, $width, 1, $charset);
-
-                    if ($breakWidth === 1) {
-                        $nextBreak = $nextChar;
-                    } else {
-                        $nextBreak = iconv_substr($string, $breakWidth, 1, $charset);
-                    }
-
-                    if ($nextChar === ' ' || $nextBreak === $break) {
-                        $afterNextChar = iconv_substr($string, $width + 1, 1, $charset);
-
-                        if ($afterNextChar === false) {
-                            $subString .= $nextChar;
-                        }
-
-                        $cutLength = iconv_strlen($subString, $charset) + 1;
-                    } else {
-                        $spacePos = iconv_strrpos($subString, ' ', $charset);
-
-                        if ($spacePos !== false) {
-                            $subString = iconv_substr($subString, 0, $spacePos, $charset);
-                            $cutLength = $spacePos + 1;
-                        } else if ($cut === false) {
-                            $spacePos = iconv_strpos($string, ' ', 0, $charset);
-
-                            if ($spacePos !== false) {
-                                $subString = iconv_substr($string, 0, $spacePos, $charset);
-                                $cutLength = $spacePos + 1;
-                            } else {
-                                $subString = $string;
-                                $cutLength = null;
-                            }
-                        } else {
-                            $subString = iconv_substr($subString, 0, $width, $charset);
-                            $cutLength = $width;
-                        }
-                    }
-                }
+                $possibleBreak = iconv_substr($string, $current, $breakWidth, $charset);
             }
-
-            $result[] = $subString;
-
-            if ($cutLength !== null) {
-                $string = iconv_substr($string, $cutLength, ($stringLength - $cutLength), $charset);
-            } else {
-                break;
+            
+            if ($possibleBreak === $break) {
+                $result    .= iconv_substr($string, $lastStart, $current - $lastStart + $breakWidth, $charset);
+                $current   += $breakWidth - 1;
+                $lastStart  = $lastSpace = $current + 1;
+            } elseif ($char === ' ') {
+                if ($current - $lastStart >= $width) {
+                    $result    .= iconv_substr($string, $lastStart, $current - $lastStart, $charset) . $break;
+                    $lastStart  = $current + 1;
+                }
+                
+                $lastSpace = $current;
+            } elseif ($current - $lastStart >= $width && $cut && $lastStart >= $lastSpace) {
+                $result    .= iconv_substr($string, $lastStart, $current - $lastStart, $charset) . $break;
+                $lastStart  = $lastSpace = $current;
+            } elseif ($current - $lastStart >= $width && $lastStart < $lastSpace) {
+                $result    .= iconv_substr($string, $lastStart, $lastSpace - $lastStart, $charset) . $break;
+                $lastStart  = $lastSpace = $lastSpace + 1;
             }
         }
-
-        return implode($break, $result);
+        
+        if ($lastStart !== $current) {
+            $result .= iconv_substr($string, $lastStart, $current - $lastStart, $charset);
+        }
+        
+        return $result;
     }
 
     /**
@@ -123,7 +101,7 @@ class Zend_Text_MultiByte
      * @param  string  $charset
      * @return string
      */
-    public static function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT, $charset = 'UTF-8')
+    public static function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT, $charset = 'utf-8')
     {
         $return          = '';
         $lengthOfPadding = $padLength - iconv_strlen($input, $charset);

tests/Zend/Text/MultiByteTest.php

@@ -84,7 +84,7 @@ class Zend_Text_MultiByteTest extends PHPUnit_Framework_TestCase
     public function testWordWrapLongBreak()
     {
         $line = Zend_Text_MultiByte::wordWrap("Ä very<br>long wöö<br>öööööööö<br>öörd.", 8, '<br>', false);
-        $this->assertEquals("Ä very<br>long<br>wöö<br>öööööööö<br>öörd.", $line);
+        $this->assertEquals("Ä very<br>long wöö<br>öööööööö<br>öörd.", $line);
     }
 
     /**
@@ -102,12 +102,30 @@ class Zend_Text_MultiByteTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('äüö äöü ', $line);
     }
 
+    public function testWordWrapCutEndingSingleSpaceWithNonSpaceDivider()
+    {
+        $line = Zend_Text_MultiByte::wordWrap('äöüäöü ', 3, '-', true);
+        $this->assertEquals('äöü-äöü-', $line);
+    }
+    
     public function testWordWrapCutEndingTwoSpaces()
     {
         $line = Zend_Text_MultiByte::wordWrap('äüöäöü  ', 3, ' ', true);
         $this->assertEquals('äüö äöü  ', $line);
     }
 
+    public function testWordWrapNoCutEndingSingleSpace()
+    {
+        $line = Zend_Text_Multibyte::wordWrap('12345 ', 5, '-', false);
+        $this->assertEquals('12345-', $line);
+    }
+
+    public function testWordWrapNoCutEndingTwoSpaces()
+    {
+        $line = Zend_Text_MultiByte::wordWrap('12345  ', 5, '-', false);
+        $this->assertEquals('12345- ', $line);
+    }
+    
     public function testWordWrapCutEndingThreeSpaces()
     {
         $line = Zend_Text_MultiByte::wordWrap('äüöäöü  ', 3, ' ', true);