Merge branch '6.4' into 7.2

* 6.4: [Lock] Fix using fractional TTLs on all platforms [Lock] Fixes an issue with PostgreSQL when using fractional TTLs [Console][Table] Fix unnecessary wrapping disable detecting modified indexes with DBAL 4.3 [cache] RedisTrait::doFetch should use pipeline instead of mget for Relay\Cluster relax assertions for forward compatibility with Symfony 7.4 [Console][Table] Fix invalid UTF-8 due to text wrapping

Author: xabbuh

Formatter/OutputFormatter.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Console\Formatter;
 
 use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Helper\Helper;
 
 use function Symfony\Component\String\b;
 
@@ -136,9 +137,11 @@ public function formatAndWrap(?string $message, int $width): string
  continue;
  }
 
+ // convert byte position to character position.
+ $pos = Helper::length(substr($message, 0, $pos));
  // add the text up to the next tag
- $output .= $this->applyCurrentStyle(substr($message, $offset, $pos - $offset), $output, $width, $currentLineLength);
- $offset = $pos + \strlen($text);
+ $output .= $this->applyCurrentStyle(Helper::substr($message, $offset, $pos - $offset), $output, $width, $currentLineLength);
+ $offset = $pos + Helper::length($text);
 
  // opening tag?
  if ($open = '/' !== $text[1]) {
@@ -159,7 +162,7 @@ public function formatAndWrap(?string $message, int $width): string
  }
  }
 
- $output .= $this->applyCurrentStyle(substr($message, $offset), $output, $width, $currentLineLength);
+ $output .= $this->applyCurrentStyle(Helper::substr($message, $offset), $output, $width, $currentLineLength);
 
  return strtr($output, ["\0" => '\\', '\\<' => '<', '\\>' => '>']);
  }
@@ -226,8 +229,18 @@ private function applyCurrentStyle(string $text, string $current, int $width, in
  }
 
  if ($currentLineLength) {
- $prefix = substr($text, 0, $i = $width - $currentLineLength)."\n";
- $text = substr($text, $i);
+ $lines = explode("\n", $text, 2);
+ $prefix = Helper::substr($lines[0], 0, $i = $width - $currentLineLength)."\n";
+ $text = Helper::substr($lines[0], $i);
+
+ if (isset($lines[1])) {
+ // $prefix may contain the full first line in which the \n is already a part of $prefix.
+ if ('' !== $text) {
+ $text .= "\n";
+ }
+
+ $text .= $lines[1];
+ }
  } else {
  $prefix = '';
  }
@@ -242,8 +255,8 @@ private function applyCurrentStyle(string $text, string $current, int $width, in
 
  $lines = explode("\n", $text);
 
- foreach ($lines as $line) {
- $currentLineLength += \strlen($line);
+ foreach ($lines as $i => $line) {
+ $currentLineLength = 0 === $i ? $currentLineLength + Helper::length($line) : Helper::length($line);
  if ($width <= $currentLineLength) {
  $currentLineLength = 0;
  }

Helper/Helper.php

@@ -80,6 +80,10 @@ public static function substr(?string $string, int $from, ?int $length = null):
  {
  $string ??= '';
 
+ if (preg_match('//u', $string)) {
+ return (new UnicodeString($string))->slice($from, $length);
+ }
+
  if (false === $encoding = mb_detect_encoding($string, null, true)) {
  return substr($string, $from, $length);
  }

Tests/Formatter/OutputFormatterTest.php

@@ -365,6 +365,14 @@ public function testFormatAndWrap()
  $this->assertSame("Lore\nm \e[37;41mip\e[39;49m\n\e[37;41msum\e[39;49m \ndolo\nr \e[32msi\e[39m\n\e[32mt\e[39m am\net", $formatter->formatAndWrap('Lorem <error>ipsum</error> dolor <info>sit</info> amet', 4));
  $this->assertSame("Lorem \e[37;41mip\e[39;49m\n\e[37;41msum\e[39;49m dolo\nr \e[32msit\e[39m am\net", $formatter->formatAndWrap('Lorem <error>ipsum</error> dolor <info>sit</info> amet', 8));
  $this->assertSame("Lorem \e[37;41mipsum\e[39;49m dolor \e[32m\e[39m\n\e[32msit\e[39m, \e[37;41mamet\e[39;49m et \e[32mlauda\e[39m\n\e[32mntium\e[39m architecto", $formatter->formatAndWrap('Lorem <error>ipsum</error> dolor <info>sit</info>, <error>amet</error> et <info>laudantium</info> architecto', 18));
+ $this->assertSame("\e[37;41mnon-empty-array\e[39;49m\e[37;41m<mixed, mixed>\e[39;49m given.\n🪪 argument.type", $formatter->formatAndWrap("<error>non-empty-array<mixed, mixed></error> given.\n🪪 argument.type", 38));
+ $this->assertSame("Usuário <strong>{{user_name}}</strong> não é válid\no.", $formatter->formatAndWrap('Usuário <strong>{{user_name}}</strong> não é válido.', 50));
+ $this->assertSame("foo\e[37;41mb\e[39;49m\n\e[37;41mar\e[39;49mbaz", $formatter->formatAndWrap("foo<error>b\nar</error>baz", 7));
+ $this->assertSame("foo\e[37;41mbar\e[39;49mbaz\nnewline", $formatter->formatAndWrap("foo<error>bar</error>baz\nnewline", 11));
+ $this->assertSame("foobarbaz\n\e[37;41mnewline\e[39;49m", $formatter->formatAndWrap("foobarbaz\n<error>newline</error>", 11));
+ $this->assertSame("foobar\e[37;41mbaz\e[39;49m\n\e[37;41mnewline\e[39;49m", $formatter->formatAndWrap("foobar<error>baz\nnewline</error>", 11));
+ $this->assertSame("foobar\e[37;41mbazne\e[39;49m\n\e[37;41mwline\e[39;49m", $formatter->formatAndWrap("foobar<error>bazne\nwline</error>", 11));
+ $this->assertSame("foobar\e[37;41mbazne\e[39;49m\n\e[37;41mw\e[39;49m\n\e[37;41mline\e[39;49m", $formatter->formatAndWrap("foobar<error>baznew\nline</error>", 11));
 
  $formatter = new OutputFormatter();
 
@@ -376,6 +384,14 @@ public function testFormatAndWrap()
  $this->assertSame("Â rèälly\nlöng tîtlè\nthät cöüld\nnèêd\nmúltîplê\nlínès", $formatter->formatAndWrap('Â rèälly löng tîtlè thät cöüld nèêd múltîplê línès', 10));
  $this->assertSame("Â rèälly\nlöng tîtlè\nthät cöüld\nnèêd\nmúltîplê\n línès", $formatter->formatAndWrap("Â rèälly löng tîtlè thät cöüld nèêd múltîplê\n línès", 10));
  $this->assertSame('', $formatter->formatAndWrap(null, 5));
+ $this->assertSame("non-empty-array<mixed, mixed> given.\n🪪 argument.type", $formatter->formatAndWrap("<error>non-empty-array<mixed, mixed></error> given.\n🪪 argument.type", 38));
+ $this->assertSame("Usuário <strong>{{user_name}}</strong> não é válid\no.", $formatter->formatAndWrap('Usuário <strong>{{user_name}}</strong> não é válido.', 50));
+ $this->assertSame("foob\narbaz", $formatter->formatAndWrap("foo<error>b\nar</error>baz", 7));
+ $this->assertSame("foobarbaz\nnewline", $formatter->formatAndWrap("foo<error>bar</error>baz\nnewline", 11));
+ $this->assertSame("foobarbaz\nnewline", $formatter->formatAndWrap("foobarbaz\n<error>newline</error>", 11));
+ $this->assertSame("foobarbaz\nnewline", $formatter->formatAndWrap("foobar<error>baz\nnewline</error>", 11));
+ $this->assertSame("foobarbazne\nwline", $formatter->formatAndWrap("foobar<error>bazne\nwline</error>", 11));
+ $this->assertSame("foobarbazne\nw\nline", $formatter->formatAndWrap("foobar<error>baznew\nline</error>", 11));
  }
 }