Merge branch '2.2'

keradus · keradus · commit e98b85d73394 · 2017-05-14T23:29:25.000+02:00
diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
@@ -325,14 +325,8 @@ public function clearEmptyTokens()
     public function ensureWhitespaceAtIndex($index, $indexOffset, $whitespace)
     {
         $removeLastCommentLine = function (Token $token, $indexOffset) {
-            // because comments tokens are greedy and may consume single \n if we are putting whitespace after it let trim that \n
-            if (1 === $indexOffset && $token->isComment()) {
-                $token->setContent(preg_replace(
-                    "#\r\n$|\n$#",
-                    '',
-                    $token->getContent(),
-                    1
-                ));
+            if (1 === $indexOffset && $token->isGivenKind(T_OPEN_TAG)) {
+                $token->setContent(rtrim($token->getContent()));
             }
         };
 
diff --git a/tests/Tokenizer/TokensTest.php b/tests/Tokenizer/TokensTest.php
@@ -859,6 +859,85 @@ public function assertFindBlockEnd($expectedIndex, $source, $type, $searchIndex)
         $this->assertFalse($detectedType['isStart']);
     }
 
+    /**
+     * @param string $expected   valid PHP code
+     * @param string $input      valid PHP code
+     * @param int    $index      token index
+     * @param int    $offset
+     * @param string $whiteSpace white space
+     *
+     * @dataProvider provideEnsureWhitespaceAtIndexCases
+     */
+    public function testEnsureWhitespaceAtIndex($expected, $input, $index, $offset, $whiteSpace)
+    {
+        $tokens = Tokens::fromCode($input);
+        $tokens->ensureWhitespaceAtIndex($index, $offset, $whiteSpace);
+
+        $this->assertSame($expected, $tokens->generateCode());
+    }
+
+    public function provideEnsureWhitespaceAtIndexCases()
+    {
+        return [
+            [
+                '<?php ',
+                '<?php',
+                0,
+                1,
+                ' ',
+            ],
+            [
+                "<?php\n",
+                '<?php',
+                0,
+                1,
+                "\n",
+            ],
+            [
+                "<?php\t",
+                '<?php',
+                0,
+                1,
+                "\t",
+            ],
+            [
+                '<?php
+//
+ echo $a;',
+                '<?php
+//
+echo $a;',
+                2,
+                1,
+                "\n ",
+            ],
+            [
+                '<?php
+ echo $a;',
+                '<?php
+echo $a;',
+                0,
+                1,
+                "\n ",
+            ],
+            [
+                '<?php
+echo $a;',
+                '<?php echo $a;',
+                0,
+                1,
+                "\n",
+            ],
+            [
+                "<?php\techo \$a;",
+                '<?php echo $a;',
+                0,
+                1,
+                "\t",
+            ],
+        ];
+    }
+
     /**
      * @param null|Token[] $expected
      * @param null|Token[] $input
