Fix for Newline with EncapsedStringsToSprintfRector

rules/coding-style/src/Rector/Encapsed/EncapsedStringsToSprintfRector.php

@@ -97,6 +97,7 @@ private function collectEncapsedStringPart(EncapsedStringPart $encapsedStringPar
         $stringValue = $encapsedStringPart->value;
         if ($stringValue === "\n") {
             $this->argumentVariables[] = new ConstFetch(new Name('PHP_EOL'));
+            $this->sprintfFormat .= '%s';
             return;
         }
 
@@ -122,8 +123,16 @@ private function collectExpr(Expr $expr): void
     private function createSprintfFuncCallOrConcat(string $string, array $argumentVariables): Node
     {
         // special case for variable with PHP_EOL
-        if ($string === '%s' && count($argumentVariables) === 2) {
-            return new Concat($argumentVariables[0], $argumentVariables[1]);
+        if ($string === '%s%s' && count($argumentVariables) === 2 &&
+            count(
+                array_filter(
+                    $argumentVariables,
+                    fn($argumentVar): bool => $argumentVar instanceof ConstFetch && $argumentVar->name.'' === 'PHP_EOL'
+                )
+            )
+        )
+        {
+                return new Concat($argumentVariables[0], $argumentVariables[1]);
         }
 
         $arguments = [new Arg(new String_($string))];

rules/coding-style/tests/Rector/Encapsed/EncapsedStringsToSprintfRector/Fixture/newline2.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\Encapsed\EncapsedStringsToSprintfRector\Fixture;
+
+final class Newline2
+{
+    public function run(string $format)
+    {
+        return "\n${format}";
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\Encapsed\EncapsedStringsToSprintfRector\Fixture;
+
+final class Newline2
+{
+    public function run(string $format)
+    {
+        return PHP_EOL . $format;
+    }
+}
+
+?>

rules/coding-style/tests/Rector/Encapsed/EncapsedStringsToSprintfRector/Fixture/prefixed_eol.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\Encapsed\EncapsedStringsToSprintfRector\Fixture;
+
+final class PrefixedEol
+{
+    public function run(string $format)
+    {
+        return "prefix $format\n";
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\Encapsed\EncapsedStringsToSprintfRector\Fixture;
+
+final class PrefixedEol
+{
+    public function run(string $format)
+    {
+        return sprintf('prefix %s%s', $format, PHP_EOL);
+    }
+}
+
+?>