Skip to content

Commit 8097317

Browse files
committed
Merge branch '0.7.x'
Conflicts: CHANGELOG.md
2 parents eef09db + f4c2c2c commit 8097317

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This file is a manually maintained list of changes for each release. Feel free
44
to add your changes here when sending pull requests. Also send corrections if
55
you spot any mistakes.
66

7-
## 0.8.0 (2013-xx-xx)
7+
## 0.8.0 (2014-xx-xx)
88

99
* Feature: The base `Graph`, `Vertex` and `EdgeBase` classes can now be
1010
extended in order to implement a custom behavior. As such, one can now also
@@ -39,10 +39,6 @@ you spot any mistakes.
3939
edges. This also fixes an issue where `Algorithm\DetectNegativeCycle` didn't work
4040
for unweighted edges. ([#81](https://github.com/clue/graph/issues/81)
4141

42-
* Fix: Throwing an `UnexpectedValueException` if writing GraphViz Dot script
43-
to a temporary file fails and remove its debugging output
44-
([#77](https://github.com/clue/graph/issues/77) and [#78](https://github.com/clue/graph/issues/78) @Metabor)
45-
4642
* Fix: The `Algorithm\MinimumCostFlow` algorithms now work again. The reference
4743
to a non-existant class has been updated. Also fixed several issues with
4844
regards to special cases such as disconnected or undirected graphs.
@@ -58,6 +54,15 @@ you spot any mistakes.
5854
| `Walk::getVertexSource()` | `Walk::getVertices()->getVertexFirst()` |
5955
| `Walk::getVertexTarget()` | `Walk::getVertices()->getVertexLast()` |
6056

57+
## 0.7.1 (2014-03-12)
58+
59+
* Fix: Throwing an `UnexpectedValueException` if writing GraphViz Dot script
60+
to a temporary file fails and remove its debugging output
61+
([#77](https://github.com/clue/graph/issues/77) and [#78](https://github.com/clue/graph/issues/78) @Metabor)
62+
63+
* Fix: Improved GraphViz support for MS Windows
64+
([#99](https://github.com/clue/graph/issues/99))
65+
6166
## 0.7.0 (2013-09-11)
6267

6368
* Feature: Add new `Set\Vertices` and `Set\Edges` classes that handle common

lib/Fhaculty/Graph/GraphViz.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ public function display()
133133
}
134134

135135
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
136-
//echo "ausgabe\n";
137-
exec($tmp . ' >NUL');
136+
// open image in untitled, temporary background shell
137+
exec('start "" ' . escapeshellarg($tmp) . ' >NUL');
138138
} elseif (strtoupper(PHP_OS) === 'DARWIN') {
139139
// open image in background (redirect stdout to /dev/null, sterr to stdout and run in background)
140140
exec('open ' . escapeshellarg($tmp) . ' > /dev/null 2>&1 &');
@@ -259,7 +259,7 @@ public function createImageFile()
259259
$ret = 0;
260260

261261
$executable = $this->getExecutable();
262-
system($executable . ' -T ' . escapeshellarg($this->format) . ' ' . escapeshellarg($tmp) . ' -o ' . escapeshellarg($tmp . '.' . $this->format), $ret);
262+
system(escapeshellarg($executable) . ' -T ' . escapeshellarg($this->format) . ' ' . escapeshellarg($tmp) . ' -o ' . escapeshellarg($tmp . '.' . $this->format), $ret);
263263
if ($ret !== 0) {
264264
throw new UnexpectedValueException('Unable to invoke "' . $executable .'" to create image file (code ' . $ret . ')');
265265
}

0 commit comments

Comments
 (0)