Merge branch 'fix-graphviz-windows' into 0.7.x

Author: clue

CHANGELOG.md

@@ -10,6 +10,9 @@ you spot any mistakes.
     to a temporary file fails and remove its debugging output
     ([#77](https://github.com/clue/graph/issues/77) and [#78](https://github.com/clue/graph/issues/78) @Metabor)
 
+*   Fix: Improved GraphViz support for MS Windows
+    ([#99](https://github.com/clue/graph/issues/99))
+
 ## 0.7.0 (2013-09-11)
 
 *   Feature: Add new `Set\Vertices` and `Set\Edges` classes that handle common

lib/Fhaculty/Graph/GraphViz.php

@@ -133,8 +133,8 @@ public function display()
         }
 
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            //echo "ausgabe\n";
-            exec($tmp . ' >NUL');
+            // open image in untitled, temporary background shell
+            exec('start "" ' . escapeshellarg($tmp) . ' >NUL');
         } elseif (strtoupper(PHP_OS) === 'DARWIN') {
             // open image in background (redirect stdout to /dev/null, sterr to stdout and run in background)
             exec('open ' . escapeshellarg($tmp) . ' > /dev/null 2>&1 &');
@@ -259,7 +259,7 @@ public function createImageFile()
         $ret = 0;
 
         $executable = $this->getExecutable();
-        system($executable . ' -T ' . escapeshellarg($this->format) . ' ' . escapeshellarg($tmp) . ' -o ' . escapeshellarg($tmp . '.' . $this->format), $ret);
+        system(escapeshellarg($executable) . ' -T ' . escapeshellarg($this->format) . ' ' . escapeshellarg($tmp) . ' -o ' . escapeshellarg($tmp . '.' . $this->format), $ret);
         if ($ret !== 0) {
             throw new UnexpectedValueException('Unable to invoke "' . $executable .'" to create image file (code ' . $ret . ')');
         }