Skip to content

Commit 1dac380

Browse files
committed
fix mbstring functions pb
1 parent 4e9f130 commit 1dac380

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/Ubiquity/devtools/cmd/ConsoleTable.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private function getCellOutput($index, $row = null) {
9393
}
9494
$content = preg_replace('#\x1b[[][^A-Za-z]*[A-Za-z]#', '', $cell);
9595

96-
$delta = - mb_strlen($cell, 'UTF-8') + mb_strlen($content, 'UTF-8') + $this->padding;
96+
$delta = - \mb_strlen($cell, 'UTF-8') + \mb_strlen($content, 'UTF-8') + $this->padding;
9797
$output .= $this->mb_str_pad($cell, $width - $delta, $row ? ' ' : '-'); // cell content
9898

9999
if ($row && $index == count($row) - 1) {
@@ -124,8 +124,8 @@ private function initializeBorders() {
124124
*/
125125
private function mb_str_pad($str, $pad_len, $pad_str = ' ', $dir = STR_PAD_RIGHT, $encoding = NULL) {
126126
$content = preg_replace('#\x1b[[][^A-Za-z]*[A-Za-z]#', '', $str);
127-
$str_len = mb_strlen($content);
128-
$pad_str_len = mb_strlen($pad_str);
127+
$str_len = \mb_strlen($content);
128+
$pad_str_len = \mb_strlen($pad_str);
129129
if (! $str_len && ($dir == STR_PAD_RIGHT || $dir == STR_PAD_LEFT)) {
130130
$str_len = 1; // @debug
131131
}
@@ -137,14 +137,14 @@ private function mb_str_pad($str, $pad_len, $pad_str = ' ', $dir = STR_PAD_RIGHT
137137
$repeat = ceil($str_len - $pad_str_len + $pad_len);
138138
if ($dir == STR_PAD_RIGHT) {
139139
$result = $str . str_repeat($pad_str, $repeat);
140-
$result = mb_substr($result, 0, $pad_len);
140+
$result = \mb_substr($result, 0, $pad_len);
141141
} else if ($dir == STR_PAD_LEFT) {
142142
$result = str_repeat($pad_str, $repeat) . $str;
143-
$result = mb_substr($result, - $pad_len);
143+
$result = \mb_substr($result, - $pad_len);
144144
} else if ($dir == STR_PAD_BOTH) {
145145
$length = ($pad_len - $str_len) / 2;
146146
$repeat = ceil($length / $pad_str_len);
147-
$result = mb_substr(str_repeat($pad_str, $repeat), 0, floor($length)) . $str . mb_substr(str_repeat($pad_str, $repeat), 0, ceil($length));
147+
$result = \mb_substr(str_repeat($pad_str, $repeat), 0, floor($length)) . $str . \mb_substr(str_repeat($pad_str, $repeat), 0, ceil($length));
148148
}
149149

150150
return $result;
@@ -310,8 +310,8 @@ private function calculateColWidths() {
310310
$this->rowHeight[$y] = $size;
311311
}
312312
foreach ($lines as $line) {
313-
$content = preg_replace('#\x1b[[][^A-Za-z]*[A-Za-z]#', '', $line);
314-
$len = mb_strlen($content, 'UTF-8');
313+
$content = \preg_replace('#\x1b[[][^A-Za-z]*[A-Za-z]#', '', $line);
314+
$len = \mb_strlen($content, 'UTF-8');
315315
if (! isset($this->colWidths[$index])) {
316316
$this->colWidths[$index] = $len + 2 * $this->padding;
317317
} else {

0 commit comments

Comments
 (0)