fix trimChars recursion bug

pgorod · pgorod · commit 808275b04070 · 2020-04-08T18:56:45.000+01:00
diff --git a/include/SugarLogger/SugarLogger.php b/include/SugarLogger/SugarLogger.php
@@ -224,10 +224,10 @@ private function extendedPrintR($data, $maxLevel = 5, $eol = PHP_EOL, $trimChars
                     $print .= $eol.($eol==PHP_EOL? "  {$spaces}" : '')."[{$key}] => ";
                     if (strlen($print) < $trimChars) {
                         $print .= in_array(gettype($element), array('object', 'array')) ?
-                            $this->extendedPrintR($element, $maxLevel, $eol, $currLevel + 1, $numSpaces + 2) :
+                            $this->extendedPrintR($element, $maxLevel, $eol, $trimChars, $currLevel + 1, $numSpaces + 2) :
                             (is_string($element) ? ("'" . $element . "'") : $element);
                     } else {
-                        return $print; // excess chars, finish everything early
+                        return ($print . '…'); // excess chars, finish everything early
                     }
                 }
             } else {

Original file line number	Diff line number	Diff line change
`@@ -224,10 +224,10 @@ private function extendedPrintR($data, $maxLevel = 5, $eol = PHP_EOL, $trimChars`
`224`	`224`	`$print .= $eol.($eol==PHP_EOL? " {$spaces}" : '')."[{$key}] => ";`
`225`	`225`	`if (strlen($print) < $trimChars) {`
`226`	`226`	`$print .= in_array(gettype($element), array('object', 'array')) ?`
`227`		`- $this->extendedPrintR($element, $maxLevel, $eol, $currLevel + 1, $numSpaces + 2) :`
	`227`	`+ $this->extendedPrintR($element, $maxLevel, $eol, $trimChars, $currLevel + 1, $numSpaces + 2) :`
`228`	`228`	`(is_string($element) ? ("'" . $element . "'") : $element);`
`229`	`229`	`} else {`
`230`		`- return $print; // excess chars, finish everything early`
	`230`	`+ return ($print . '…'); // excess chars, finish everything early`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`	`} else {`