Fix building report's path - closes #12

EdgedesignCZ · Jan 12, 2016 · 0fc6977 · 0fc6977
1 parent 49c2352
commit 0fc6977
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/CodeAnalysisTasks.php b/src/CodeAnalysisTasks.php
@@ -216,19 +216,19 @@ private function buildReport()
         foreach ($this->usedTools as $tool => $config) {
             if ($config['transformedXml']) {
                 xmlToHtml(
-                    "{$this->options->buildDir}{$config['transformedXml']}",
+                    $this->options->rawFile($config['transformedXml']),
                     $this->config->path("report.{$tool}"),
-                    "{$this->options->buildDir}{$tool}.html"
+                    $this->options->rawFile("{$tool}.html")
                 );
-                $this->writeHtmlReport("<info>{$this->options->buildDir}{$tool}.html</info>");
+                $this->writeHtmlReport("<info>{$this->options->rawFile("{$tool}.html")}</info>");
             }
         }
         twigToHtml(
             'phpqa.html.twig',
             array('tools' => array_keys($this->usedTools)),
-            "{$this->options->buildDir}phpqa.html"
+            $this->options->rawFile('phpqa.html')
         );
-        $this->writeHtmlReport("<comment>{$this->options->buildDir}phpqa.html</comment>", true);
+        $this->writeHtmlReport("<comment>{$this->options->rawFile("phpqa.html")}</comment>", true);
     }
 
     // copy-paste from \Robo\Common\TaskIO

diff --git a/src/Options.php b/src/Options.php
@@ -58,6 +58,11 @@ public function filterTools(array $tools)
 
     public function toFile($file)
     {
-        return escapePath("{$this->buildDir}/{$file}");
+        return escapePath($this->rawFile($file));
+    }
+
+    public function rawFile($file)
+    {
+        return "{$this->buildDir}/{$file}";
     }
 }
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
@@ -31,6 +31,7 @@ public function testShouldEscapePaths()
     {
         assertThat($this->fileOutput->analyzedDir, is('"./"'));
         assertThat($this->fileOutput->toFile('file'), is('"build//file"'));
+        assertThat($this->fileOutput->rawFile('file'), is('build//file'));
     }
 
     public function testShouldIgnorePdependInCliOutput()