--- a/web/lib/Zend/Text/MultiByte.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Text/MultiByte.php Thu Mar 21 19:50:53 2013 +0100
@@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Text
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: MultiByte.php 21931 2010-04-18 15:25:32Z dasprid $
+ * @version $Id: MultiByte.php 24762 2012-05-06 00:06:46Z adamlundrigan $
*/
/**
@@ -24,7 +24,7 @@
*
* @category Zend
* @package Zend_Text
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Text_MultiByte
@@ -39,78 +39,56 @@
* @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);
+ }
+
+ 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;
}
- }
-
- $result[] = $subString;
-
- if ($cutLength !== null) {
- $string = iconv_substr($string, $cutLength, ($stringLength - $cutLength), $charset);
- } else {
- break;
+
+ $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,13 +101,13 @@
* @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);
$padStringLength = iconv_strlen($padString, $charset);
- if ($padStringLength === 0 || $lengthOfPadding === 0) {
+ if ($padStringLength === 0 || $lengthOfPadding <= 0) {
$return = $input;
} else {
$repeatCount = floor($lengthOfPadding / $padStringLength);