From 41bba56895b78ba90b04fef0cf0b194134a4c8ea Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 17 Sep 2024 11:54:14 +0400 Subject: [PATCH] modifs.mineures sans commentaires --- .idea/php-test-framework.xml | 14 -------------- src/output/std/StdMessenger.php | 11 +++++++---- 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 .idea/php-test-framework.xml diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml deleted file mode 100644 index c092999..0000000 --- a/.idea/php-test-framework.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/output/std/StdMessenger.php b/src/output/std/StdMessenger.php index 456dbfd..6468a69 100644 --- a/src/output/std/StdMessenger.php +++ b/src/output/std/StdMessenger.php @@ -7,6 +7,7 @@ use nur\sery\cl; use nur\sery\ExceptionShadow; use nur\sery\output\IMessenger; use nur\sery\UserException; +use nur\SL; use Throwable; class StdMessenger implements _IMessenger { @@ -241,6 +242,7 @@ class StdMessenger implements _IMessenger { int $indentLevel, StdOutput $out): void { $prefixes = self::GENERIC_PREFIXES[$level][$type]; if ($prefixes[0]) $out->print(); + $content = SL::with($content); if ($out->isColor()) { $before = $prefixes[2]; $prefix = $prefixes[3]; @@ -249,7 +251,7 @@ class StdMessenger implements _IMessenger { $suffix2 = $suffix !== null? " $suffix": null; $after = $prefixes[5]; - $lines = $out->getLines(false, $content); + $lines = $out->getLines(false, ...$content); $maxlen = 0; foreach ($lines as &$content) { $line = $out->filterColors($content); @@ -274,7 +276,7 @@ class StdMessenger implements _IMessenger { $prefix = $prefixes[1]; if ($prefix !== null) $prefix .= " "; $prefix2 = str_repeat(" ", mb_strlen($prefix)); - $lines = $out->getLines(false, $content); + $lines = $out->getLines(false, ...$content); foreach ($lines as $content) { if ($linePrefix !== null) $out->write($linePrefix); $out->iprint($indentLevel, $prefix, $content); @@ -360,6 +362,7 @@ class StdMessenger implements _IMessenger { string $type, $content, int $indentLevel, StdOutput $out): void { $prefixes = self::GENERIC_PREFIXES[$level][$type]; + $content = SL::with($content); if ($out->isColor()) { $prefix = $prefixes[1]; $prefix2 = null; @@ -369,7 +372,7 @@ class StdMessenger implements _IMessenger { $prefix2 = str_repeat(" ", mb_strlen($prefix2)); } $suffix = $prefixes[2]; - $lines = $out->getLines(false, $content); + $lines = $out->getLines(false, ...$content); foreach ($lines as $content) { if ($linePrefix !== null) $out->write($linePrefix); $out->iprint($indentLevel, $prefix, $content, $suffix); @@ -379,7 +382,7 @@ class StdMessenger implements _IMessenger { $prefix = $prefixes[0]; if ($prefix !== null) $prefix .= " "; $prefix2 = str_repeat(" ", mb_strlen($prefix)); - $lines = $out->getLines(false, $content); + $lines = $out->getLines(false, ...$content); foreach ($lines as $content) { if ($linePrefix !== null) $out->write($linePrefix); $out->iprint($indentLevel, $prefix, $content);