Merge branch '2.15' into 2.16

nutshellcrm · Jun 27, 2020 · 5e6acea · 5e6acea
2 parents 140d38a + dfc4f07
commit 5e6acea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Fixer/Import/SingleLineAfterImportsFixer.php b/src/Fixer/Import/SingleLineAfterImportsFixer.php
@@ -137,6 +137,9 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
 
                 if ($tokens[$insertIndex]->isWhitespace()) {
                     $nextToken = $tokens[$insertIndex];
+                    if (2 === substr_count($nextToken->getContent(), "\n")) {
+                        continue;
+                    }
                     $nextMeaningfulAfterUseIndex = $tokens->getNextMeaningfulToken($insertIndex);
                     if (null !== $nextMeaningfulAfterUseIndex && $tokens[$nextMeaningfulAfterUseIndex]->isGivenKind(T_USE)) {
                         if (substr_count($nextToken->getContent(), "\n") < 2) {

diff --git a/tests/Fixer/Import/SingleLineAfterImportsFixerTest.php b/tests/Fixer/Import/SingleLineAfterImportsFixerTest.php
@@ -436,6 +436,13 @@ class Test {}
 use some\a\ClassA; use function some\a\fn_a; use const some\c;
 ',
             ],
+            [
+                str_replace("\n", "\r\n", '<?php
+use Foo;
+
+class Bar {}
+'),
+            ],
         ];
     }