From 484640759226061008226ddbeb84ef4d78319ee2 Mon Sep 17 00:00:00 2001 From: Possum Date: Sat, 26 Sep 2015 08:45:47 +0200 Subject: [PATCH] Do not line if there is a line. --- .../CS/Fixer/Symfony/BlanklineAfterOpenTagFixer.php | 3 ++- .../Fixer/Symfony/BlanklineAfterOpenTagFixerTest.php | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Symfony/CS/Fixer/Symfony/BlanklineAfterOpenTagFixer.php b/Symfony/CS/Fixer/Symfony/BlanklineAfterOpenTagFixer.php index c1847f0f0c8..e137ce49f61 100644 --- a/Symfony/CS/Fixer/Symfony/BlanklineAfterOpenTagFixer.php +++ b/Symfony/CS/Fixer/Symfony/BlanklineAfterOpenTagFixer.php @@ -38,6 +38,7 @@ public function fix(\SplFileInfo $file, $content) } $newlineFound = false; + /** @var Token $token */ foreach ($tokens as $token) { if ($token->isWhitespace(array('whitespaces' => "\n"))) { $newlineFound = true; @@ -56,7 +57,7 @@ public function fix(\SplFileInfo $file, $content) $token->setContent(rtrim($token->getContent())."\n"); } - if (!$tokens[1]->isWhitespace(array('whitespaces' => "\n"))) { + if (!$tokens[1]->isWhitespace() && false === strpos($tokens[1]->getContent(), "\n")) { $tokens->insertAt(1, new Token(array(T_WHITESPACE, "\n"))); } diff --git a/Symfony/CS/Tests/Fixer/Symfony/BlanklineAfterOpenTagFixerTest.php b/Symfony/CS/Tests/Fixer/Symfony/BlanklineAfterOpenTagFixerTest.php index c2b037cf1d5..f60989dc6ae 100644 --- a/Symfony/CS/Tests/Fixer/Symfony/BlanklineAfterOpenTagFixerTest.php +++ b/Symfony/CS/Tests/Fixer/Symfony/BlanklineAfterOpenTagFixerTest.php @@ -39,6 +39,16 @@ public function testFix54($expected, $input = null) public function provideCases() { return array( + array( + '', ),