@@ -36,15 +36,14 @@ discard block |
||
| 36 | 36 | $substringLength = UTF8::strlen($substring, $this->encoding); |
| 37 | 37 | $length -= $substringLength; |
| 38 | 38 | |
| 39 | - $truncated = UTF8::substr |
|
| 40 | - ( |
|
| 39 | + $truncated = UTF8::substr( |
|
| 41 | 40 | $this->scalarString, |
| 42 | 41 | 0, |
| 43 | 42 | $length, |
| 44 | 43 | $this->encoding |
| 45 | 44 | ); |
| 46 | 45 | |
| 47 | - return $this->newSelf($truncated . $substring); |
|
| 46 | + return $this->newSelf($truncated.$substring); |
|
| 48 | 47 | } |
| 49 | 48 | |
| 50 | 49 | /** |
@@ -79,6 +78,6 @@ discard block |
||
| 79 | 78 | $truncated = UTF8::substr($truncated, 0, $lastPos, $this->encoding); |
| 80 | 79 | } |
| 81 | 80 | |
| 82 | - return $this->newSelf($truncated . $substring); |
|
| 81 | + return $this->newSelf($truncated.$substring); |
|
| 83 | 82 | } |
| 84 | 83 | } |
@@ -30,7 +30,10 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function truncate($length, $substring = '') |
| 32 | 32 | { |
| 33 | - if ($length >= $this->getLength()) return $this; |
|
| 33 | + if ($length >= $this->getLength()) |
|
| 34 | + { |
|
| 35 | + return $this; |
|
| 36 | + } |
|
| 34 | 37 | |
| 35 | 38 | // Need to further trim the string so we can append the substring |
| 36 | 39 | $substringLength = UTF8::strlen($substring, $this->encoding); |
@@ -63,7 +66,10 @@ discard block |
||
| 63 | 66 | */ |
| 64 | 67 | public function safeTruncate($length, $substring = '') |
| 65 | 68 | { |
| 66 | - if ($length >= $this->getLength()) return $this; |
|
| 69 | + if ($length >= $this->getLength()) |
|
| 70 | + { |
|
| 71 | + return $this; |
|
| 72 | + } |
|
| 67 | 73 | |
| 68 | 74 | // Need to further trim the string so we can append the substring |
| 69 | 75 | $substringLength = UTF8::strlen($substring, $this->encoding); |
@@ -76,7 +82,10 @@ discard block |
||
| 76 | 82 | { |
| 77 | 83 | // Find pos of the last occurrence of a space, get up to that |
| 78 | 84 | $lastPos = UTF8::strrpos($truncated, ' ', 0, $this->encoding); |
| 79 | - if (!is_integer($lastPos)) $lastPos = 0; |
|
| 85 | + if (!is_integer($lastPos)) |
|
| 86 | + { |
|
| 87 | + $lastPos = 0; |
|
| 88 | + } |
|
| 80 | 89 | $truncated = UTF8::substr($truncated, 0, $lastPos, $this->encoding); |
| 81 | 90 | } |
| 82 | 91 | |