Remove todos; bugfix for Windows-style newlines

Author: uuf6429

src/BlockString/TokenStream.php

@@ -71,7 +71,7 @@ public function next(): ?BlockString
 
 	private function extractDelimiter(Token $token): string
 	{
-		return trim($token->getContent(), "<'\"\n");
+		return trim($token->getContent(), "<'\"\r\n");
 	}
 
 	private function extractIndentation(Token $token): string

src/Formatter/AbstractCodecFormatter.php

@@ -103,11 +103,11 @@ abstract protected function formatContent(string $original): string;
 
 	private function removeIndentation(string $lines, string $indentation): string
 	{
-		return substr(str_replace("\n{$indentation}", "\n", $lines), strlen($indentation)); // TODO feels wrong (eol)
+		return substr(str_replace("\n{$indentation}", "\n", $lines), strlen($indentation));
 	}
 
 	private function applyIndentation(string $lines, string $indentation): string
 	{
-		return $indentation . str_replace("\n", "\n{$indentation}", $lines); // TODO feels wrong (eol)
+		return $indentation . str_replace("\n", "\n{$indentation}", $lines);
 	}
 }

tests/Unit/Fixer/BlockStringFixerTest.php

@@ -52,7 +52,7 @@ public function testConfigurationIsRequired(): void
 	 * @param TFormatterConfig $config
 	 * @dataProvider provideFixCases
 	 */
-	final public function testApplyFix(array $config, string $input, string $expected): void
+	public function testApplyFix(array $config, string $input, string $expected): void
 	{
 		$fixer = new BlockStringFixer();
 		$tokens = Tokens::fromCode($input);
@@ -91,7 +91,7 @@ public static function provideFixCases(): iterable
 					'HTML' => new class extends AbstractCodecFormatter {
 						public function __construct()
 						{
-							parent::__construct('1.0', null);
+							parent::__construct('1');
 						}
 
 						protected function formatContent(string $original): string
@@ -133,7 +133,7 @@ protected function formatContent(string $original): string
 					new class extends AbstractCodecFormatter {
 						public function __construct()
 						{
-							parent::__construct('1.0', null);
+							parent::__construct('2');
 						}
 
 						protected function formatContent(string $original): string
@@ -144,7 +144,7 @@ protected function formatContent(string $original): string
 					'HTML' => new class extends AbstractCodecFormatter {
 						public function __construct()
 						{
-							parent::__construct('1.0', null);
+							parent::__construct('3');
 						}
 
 						protected function formatContent(string $original): string
@@ -180,7 +180,7 @@ protected function formatContent(string $original): string
 					'HTML' => new class extends AbstractCodecFormatter {
 						public function __construct()
 						{
-							parent::__construct('1.0', new GeneratedTokenCodec());
+							parent::__construct('4', new GeneratedTokenCodec());
 						}
 
 						protected function formatContent(string $original): string
@@ -203,5 +203,25 @@ protected function formatContent(string $original): string
 					HTML;
 				PHP,
 		];
+
+		yield 'Windows-style newlines' => [
+			'config' => [
+				'formatters' => [
+					'HTML' => new class extends AbstractCodecFormatter {
+						public function __construct()
+						{
+							parent::__construct('5');
+						}
+
+						protected function formatContent(string $original): string
+						{
+							return strip_tags($original);
+						}
+					},
+				],
+			],
+			'input' => "<?php\r\n\r\necho <<<'HTML'\r\n    <h1>Hello world!</h1>\r\n    HTML;\r\n",
+			'expected' => "<?php\r\n\r\necho <<<'HTML'\r\n    Hello world!\r\n    HTML;\r\n",
+		];
 	}
 }