[BUGFIX] Prevent shifting of line numbers (#1358) (#1368)

s2b · web-flow · commit fc09cff93511 · 2026-04-07T19:29:52.000+02:00
When removing the `&lt;html xmlns` declarations from the template, line
breaks within the `&lt;html&gt;` tags were also removed. This lead to invalid
line numbers reported by the template parser.

With this change, the affected `&lt;html&gt;` tag is replaced with the
matching number of newlines.
diff --git a/src/Core/Parser/TemplateProcessor/NamespaceDetectionTemplateProcessor.php b/src/Core/Parser/TemplateProcessor/NamespaceDetectionTemplateProcessor.php
@@ -114,7 +114,8 @@ public function registerNamespacesFromTemplateSource(string $templateSource): st
                 $viewHelperResolver->addLocalNamespace($set[1], $namespacePhp);
             }
             if (strpos($matches[0], 'data-namespace-typo3-fluid="true"')) {
-                $templateSource = str_replace($matches[0], '', $templateSource);
+                $removedNewlines = substr_count($matches[0], "\n");
+                $templateSource = str_replace($matches[0], str_repeat("\n", $removedNewlines), $templateSource);
                 $closingTagName = $matches[1];
                 $closingTag = '</' . $closingTagName . '>';
                 if (strpos($templateSource, $closingTag)) {
diff --git a/tests/Functional/Core/Parser/TemplateProcessor/NamespaceDetectionTemplateProcessorTest.php b/tests/Functional/Core/Parser/TemplateProcessor/NamespaceDetectionTemplateProcessorTest.php
@@ -96,13 +96,13 @@ public static function preProcessSourceExtractsNamespacesDataProvider(): array
             ],
             'supports xmlns detection, multiple' => [
                 ['f' => ['TYPO3Fluid\Fluid\ViewHelpers']],
-                '<html xmlns:x="http://typo3.org/ns/X/Y/ViewHelpers" xmlns:z="http://typo3.org/ns/X/Z/ViewHelpers" data-namespace-typo3-fluid="true">' . PHP_EOL . '</html>',
+                '<html' . PHP_EOL . 'xmlns:x="http://typo3.org/ns/X/Y/ViewHelpers"' . PHP_EOL . 'xmlns:z="http://typo3.org/ns/X/Z/ViewHelpers"' . PHP_EOL . 'data-namespace-typo3-fluid="true"' . PHP_EOL . '>' . PHP_EOL . '</html>' . PHP_EOL,
                 [
                     'f' => ['TYPO3Fluid\Fluid\ViewHelpers'],
                     'x' => ['X\\Y\\ViewHelpers'],
                     'z' => ['X\\Z\\ViewHelpers'],
                 ],
-                PHP_EOL,
+                PHP_EOL . PHP_EOL . PHP_EOL . PHP_EOL . PHP_EOL . PHP_EOL,
             ],
             'supports expression style namespace detection, camelCase' => [
                 ['f' => ['TYPO3Fluid\Fluid\ViewHelpers']],
