This commit cleans up the directory and path information handling

- renamed the project attribute name to source to better reflect it's a path
- save path and name of a file not only the base name

Author: theseer

src/Report/Xml/Facade.php

@@ -105,7 +105,11 @@ protected function initTargetDirectory($directory)
 
     private function processDirectory(DirectoryNode $directory, Node $context)
     {
-        $dirObject = $context->addDirectory($directory->getName());
+        $dirname = $directory->getName();
+        if ($this->project->getProjectSourceDirectory() === $dirname) {
+            $dirname = '/';
+        }
+        $dirObject = $context->addDirectory($dirname);
 
         $this->setTotals($directory, $dirObject->getTotals());
 
@@ -127,7 +131,11 @@ private function processFile(FileNode $file, Directory $context)
 
         $this->setTotals($file, $fileObject->getTotals());
 
-        $fileReport = new Report($file->getName());
+        $path = substr(
+            $file->getPath(),
+            strlen($this->project->getProjectSourceDirectory())
+        );
+        $fileReport = new Report($path);
 
         $this->setTotals($file, $fileReport->getTotals());
 

src/Report/Xml/Project.php

@@ -13,12 +13,12 @@
 class Project extends Node
 {
     /**
-     * @param string $name
+     * @param string $directory
      */
-    public function __construct($name)
+    public function __construct($directory)
     {
         $this->init();
-        $this->setProjectName($name);
+        $this->setProjectSourceDirectory($directory);
     }
 
     private function init()
@@ -34,9 +34,16 @@ private function init()
         );
     }
 
-    private function setProjectName($name)
+    private function setProjectSourceDirectory($name)
     {
-        $this->getContextNode()->setAttribute('name', $name);
+        $this->getContextNode()->setAttribute('source', $name);
+    }
+
+    /**
+     * @return string
+     */
+    public function getProjectSourceDirectory() {
+        return $this->getContextNode()->getAttribute('source');
     }
 
     /**

src/Report/Xml/Report.php

@@ -28,7 +28,8 @@ public function __construct($name)
 
     private function setName($name)
     {
-        $this->getContextNode()->setAttribute('name', $name);
+        $this->getContextNode()->setAttribute('name', basename($name));
+        $this->getContextNode()->setAttribute('path', dirname($name));
     }
 
     public function asDom()

tests/_files/Report/XML/CoverageForBankAccount/BankAccount.php.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns="http://schema.phpunit.de/coverage/1.0">
-  <file name="BankAccount.php">
+  <file name="BankAccount.php" path="/">
     <totals>
       <lines total="33" comments="0" code="33" executable="10" executed="5" percent="50.00"/>
       <methods count="4" tested="3" percent="75.00"/>

tests/_files/Report/XML/CoverageForBankAccount/index.xml

@@ -4,7 +4,7 @@
     <runtime name="%s" version="%s" url="%s"/>
     <driver name="%s" version="%s"/>
   </build>
-  <project name="%s">
+  <project source="%s">
     <tests>
       <test name="BankAccountTest::testBalanceIsInitiallyZero" size="unknown" result="0" status="PASSED"/>
       <test name="BankAccountTest::testBalanceCannotBecomeNegative" size="unknown" result="0" status="PASSED"/>

tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/index.xml

@@ -4,7 +4,7 @@
     <runtime name="%s" version="%s" url="%s"/>
     <driver name="%s" version="%s"/>
   </build>
-  <project name="%s">
+  <project source="%s">
     <tests>
       <test name="ClassWithAnonymousFunction" size="unknown" result="0" status="PASSED"/>
     </tests>

tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns="http://schema.phpunit.de/coverage/1.0">
-  <file name="source_with_class_and_anonymous_function.php">
+  <file name="source_with_class_and_anonymous_function.php" path="/">
     <totals>
       <lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50"/>
       <methods count="2" tested="1" percent="50.00"/>

tests/_files/Report/XML/CoverageForFileWithIgnoredLines/index.xml

@@ -4,7 +4,7 @@
     <runtime name="%s" version="%s" url="%s"/>
     <driver name="%s" version="%s"/>
   </build>
-  <project name="%s">
+  <project source="%s">
     <tests>
       <test name="FileWithIgnoredLines" size="unknown" result="0" status="PASSED"/>
     </tests>

tests/_files/Report/XML/CoverageForFileWithIgnoredLines/source_with_ignore.php.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns="http://schema.phpunit.de/coverage/1.0">
-  <file name="source_with_ignore.php">
+  <file name="source_with_ignore.php" path="/">
     <totals>
       <lines total="37" comments="12" code="25" executable="2" executed="1" percent="50.00"/>
       <methods count="0" tested="0" percent="0"/>