Merge branch '6.4' into 7.0

xabbuh · xabbuh · commit c9920b0827cd · 2024-01-19T15:24:40.000+01:00
* 6.4:
  fix used class after merge
  fix tests
  [Console] Only execute additional checks for color support if the output is a TTY
  fix aircraft inflection
  [TwigBundle] Fix configuration when 'paths' is null
  register the MailPaceTransportFactory
  [String] Correct inflection of axis
  [Security] Fix `AuthenticationUtils::getLastUsername()` returning null
  [Process] Fixed inconsistent test
diff --git a/Tests/ErrorProcessInitiator.php b/Tests/ErrorProcessInitiator.php
@@ -25,7 +25,7 @@
     while (!str_contains($process->getOutput(), 'ready')) {
         usleep(1000);
     }
-    $process->signal(\SIGSTOP);
+    $process->isRunning() && $process->signal(\SIGSTOP);
     $process->wait();
 
     return $process->getExitCode();

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`while (!str_contains($process->getOutput(), 'ready')) {`
`26`	`26`	`usleep(1000);`
`27`	`27`	`}`
`28`		`- $process->signal(\SIGSTOP);`
	`28`	`+ $process->isRunning() && $process->signal(\SIGSTOP);`
`29`	`29`	`$process->wait();`
`30`	`30`
`31`	`31`	`return $process->getExitCode();`