Merge pull request #95 from ptrofimov/feature/dataset_diff

Table diff: fix for equal tables
sebastianbergmann · May 31, 2013 · ae7d79f · ae7d79f
2 parents 49269b6 + e9fbd3c
commit ae7d79f
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/PHPUnit/Extensions/Database/DataSet/AbstractTable.php b/PHPUnit/Extensions/Database/DataSet/AbstractTable.php
@@ -203,25 +203,29 @@ public function __toString()
             $values = array();
 
             foreach ($columns as $columnName) {
-                try {
-                    if ($this->getValue($i, $columnName) != $this->other->getValue($i, $columnName)) {
-                        $values[] = sprintf(
-                            '%s != actual %s',
-                            var_export($this->getValue($i, $columnName), TRUE),
-                            var_export($this->other->getValue($i, $columnName), TRUE)
-                        );
-                    } else {
-                        $values[] = $this->getValue($i, $columnName);
+                if ($this->other) {
+                    try {
+                        if ($this->getValue($i, $columnName) != $this->other->getValue($i, $columnName)) {
+                            $values[] = sprintf(
+                                '%s != actual %s',
+                                var_export($this->getValue($i, $columnName), TRUE),
+                                var_export($this->other->getValue($i, $columnName), TRUE)
+                            );
+                        } else {
+                            $values[] = $this->getValue($i, $columnName);
+                        }
+                    } catch (\InvalidArgumentException $ex) {
+                        $values[] = $this->getValue($i, $columnName) . ': no row';
                     }
-                } catch (\InvalidArgumentException $ex) {
-                    $values[] = $this->getValue($i, $columnName) . ': no row';
+                } else {
+                    $values[] = $this->getValue($i, $columnName);
                 }
             }
 
             $tableString .= $this->rowToString($values) . $lineSeperator;
         }
 
-        return "(table diff enabled) \n" . $tableString . "\n";
+        return ($this->other ? '(table diff enabled)' : '') . "\n" . $tableString . "\n";
     }
 
     protected function rowToString(Array $row)