Trim "\n" and "\t" characters when replacing relative paths with abso…

…lute ones during XML config creation (#1550) Fixes #1542
infection · Aug 9, 2021 · d3f81b1 · d3f81b1
1 parent 5c6b61f
commit d3f81b1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/TestFramework/PhpUnit/Config/Path/PathReplacer.php b/src/TestFramework/PhpUnit/Config/Path/PathReplacer.php
@@ -41,6 +41,7 @@
 use function Safe\sprintf;
 use function str_replace;
 use Symfony\Component\Filesystem\Filesystem;
+use function trim;
 
 /**
  * @internal
@@ -61,11 +62,13 @@ public function __construct(Filesystem $filesystem, ?string $phpUnitConfigDir =
      */
     public function replaceInNode(DOMNode $domElement): void
     {
-        if (!$this->filesystem->isAbsolutePath($domElement->nodeValue)) {
+        $path = trim($domElement->nodeValue);
+
+        if (!$this->filesystem->isAbsolutePath($path)) {
             $newPath = sprintf(
                 '%s/%s',
                 $this->phpUnitConfigDir,
-                ltrim($domElement->nodeValue, '\/')
+                ltrim($path, '\/')
             );
 
             // remove all occurrences of "/./". realpath can't be used because of glob patterns

diff --git a/tests/phpunit/TestFramework/PhpUnit/Config/XmlConfigurationManipulatorTest.php b/tests/phpunit/TestFramework/PhpUnit/Config/XmlConfigurationManipulatorTest.php
@@ -110,6 +110,36 @@ static function (XmlConfigurationManipulator $configManipulator, SafeDOMXPath $x
         );
     }
 
+    public function test_it_replaces_with_absolute_paths_xml_file_with_tabs(): void
+    {
+        $this->assertItChangesXML(
+            <<<'XML'
+<phpunit cacheTokens="true">
+    <testsuites>
+		<testsuite name="All Tests">
+			<directory suffix="UnitTest.php">
+				./Tests
+			</directory>
+		</testsuite>
+	</testsuites>
+</phpunit>
+XML
+            ,
+            static function (XmlConfigurationManipulator $configManipulator, SafeDOMXPath $xPath): void {
+                $configManipulator->replaceWithAbsolutePaths($xPath);
+            },
+            <<<'XML'
+<phpunit cacheTokens="true">
+  <testsuites>
+    <testsuite name="All Tests">
+      <directory suffix="UnitTest.php">/Tests</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
+XML
+        );
+    }
+
     public function test_it_removes_existing_loggers_from_pre_93_configuration(): void
     {
         $this->assertItChangesPrePHPUnit93Configuration(