sda-php
/
nur-sery
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modifs.mineures sans commentaires

This commit is contained in:
Jephté Clain 2024-09-17 11:54:14 +04:00
parent 3a66a82b86
commit 41bba56895
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.idea/php-test-framework.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PhpTestFrameworkVersionCache">
<tools_cache>
<tool tool_name="PHPUnit">
<cache>
<versions>
<info id="Local/vendor/autoload.php" version="9.6.20" />
</versions>
</cache>
</tool>
</tools_cache>
</component>
</project>

11
src/output/std/StdMessenger.php
View File

@ -7,6 +7,7 @@ use nur\sery\cl;
use nur\sery\ExceptionShadow; use nur\sery\ExceptionShadow;
use nur\sery\output\IMessenger; use nur\sery\output\IMessenger;
use nur\sery\UserException; use nur\sery\UserException;
use nur\SL;
use Throwable; use Throwable;
class StdMessenger implements _IMessenger { class StdMessenger implements _IMessenger {
@ -241,6 +242,7 @@ class StdMessenger implements _IMessenger {
int $indentLevel, StdOutput $out): void { int $indentLevel, StdOutput $out): void {
$prefixes = self::GENERIC_PREFIXES[$level][$type]; $prefixes = self::GENERIC_PREFIXES[$level][$type];
if ($prefixes[0]) $out->print(); if ($prefixes[0]) $out->print();
$content = SL::with($content);
if ($out->isColor()) { if ($out->isColor()) {
$before = $prefixes[2]; $before = $prefixes[2];
$prefix = $prefixes[3]; $prefix = $prefixes[3];
@ -249,7 +251,7 @@ class StdMessenger implements _IMessenger {
$suffix2 = $suffix !== null? " $suffix": null; $suffix2 = $suffix !== null? " $suffix": null;
$after = $prefixes[5]; $after = $prefixes[5];
$lines = $out->getLines(false, $content); $lines = $out->getLines(false, ...$content);
$maxlen = 0; $maxlen = 0;
foreach ($lines as &$content) { foreach ($lines as &$content) {
$line = $out->filterColors($content); $line = $out->filterColors($content);
@ -274,7 +276,7 @@ class StdMessenger implements _IMessenger {
$prefix = $prefixes[1]; $prefix = $prefixes[1];
if ($prefix !== null) $prefix .= " "; if ($prefix !== null) $prefix .= " ";
$prefix2 = str_repeat(" ", mb_strlen($prefix)); $prefix2 = str_repeat(" ", mb_strlen($prefix));
$lines = $out->getLines(false, $content); $lines = $out->getLines(false, ...$content);
foreach ($lines as $content) { foreach ($lines as $content) {
if ($linePrefix !== null) $out->write($linePrefix); if ($linePrefix !== null) $out->write($linePrefix);
$out->iprint($indentLevel, $prefix, $content); $out->iprint($indentLevel, $prefix, $content);
@ -360,6 +362,7 @@ class StdMessenger implements _IMessenger {
string $type, $content, string $type, $content,
int $indentLevel, StdOutput $out): void { int $indentLevel, StdOutput $out): void {
$prefixes = self::GENERIC_PREFIXES[$level][$type]; $prefixes = self::GENERIC_PREFIXES[$level][$type];
$content = SL::with($content);
if ($out->isColor()) { if ($out->isColor()) {
$prefix = $prefixes[1]; $prefix = $prefixes[1];
$prefix2 = null; $prefix2 = null;
@ -369,7 +372,7 @@ class StdMessenger implements _IMessenger {
$prefix2 = str_repeat(" ", mb_strlen($prefix2)); $prefix2 = str_repeat(" ", mb_strlen($prefix2));
} }
$suffix = $prefixes[2]; $suffix = $prefixes[2];
$lines = $out->getLines(false, $content); $lines = $out->getLines(false, ...$content);
foreach ($lines as $content) { foreach ($lines as $content) {
if ($linePrefix !== null) $out->write($linePrefix); if ($linePrefix !== null) $out->write($linePrefix);
$out->iprint($indentLevel, $prefix, $content, $suffix); $out->iprint($indentLevel, $prefix, $content, $suffix);
@ -379,7 +382,7 @@ class StdMessenger implements _IMessenger {
$prefix = $prefixes[0]; $prefix = $prefixes[0];
if ($prefix !== null) $prefix .= " "; if ($prefix !== null) $prefix .= " ";
$prefix2 = str_repeat(" ", mb_strlen($prefix)); $prefix2 = str_repeat(" ", mb_strlen($prefix));
$lines = $out->getLines(false, $content); $lines = $out->getLines(false, ...$content);
foreach ($lines as $content) { foreach ($lines as $content) {
if ($linePrefix !== null) $out->write($linePrefix); if ($linePrefix !== null) $out->write($linePrefix);
$out->iprint($indentLevel, $prefix, $content); $out->iprint($indentLevel, $prefix, $content);