Skip to content

Update graphp/graph API to latest development version #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 4, 2022
Merged

Update graphp/graph API to latest development version #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70ca5f6
Drop custom exceptions, use built-in `UnexpectedValueException` instead
clue Aug 16, 2020
cbfe6fb
Use plain arrays instead of `Edges` and `Vertices` containers
clue Jan 1, 2022
6f27b25
Clean up usage of edge API
clue Jan 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"require": {
"php": ">=5.3.0",
"graphp/graph": "dev-master#81eef65 as 1.0.0"
"graphp/graph": "dev-master#214de45 as 1.0.0"
},
"require-dev": {
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
Expand Down
1 change: 0 additions & 1 deletion examples/01-simple.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
$red->setAttribute('graphviz.color', 'red');

$edge = $graph->createEdgeDirected($blue, $red);
$edge = $blue->createEdgeTo($red);
$edge->setAttribute('graphviz.color', 'grey');

$graphviz = new Graphp\GraphViz\GraphViz();
Expand Down
44 changes: 18 additions & 26 deletions src/GraphViz.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Graphp\Graph\Edge;
use Graphp\Graph\EdgeDirected;
use Graphp\Graph\Entity;
use Graphp\Graph\Exception\UnexpectedValueException;
use Graphp\Graph\Graph;
use Graphp\Graph\Vertex;

Expand Down Expand Up @@ -187,7 +186,7 @@ public function createImageHtml(Graph $graph)
*
* @param Graph $graph graph to display
* @return string filename
* @throws UnexpectedValueException on error
* @throws \UnexpectedValueException on error
* @uses GraphViz::createScript()
*/
public function createImageFile(Graph $graph)
Expand All @@ -197,20 +196,20 @@ public function createImageFile(Graph $graph)

$tmp = tempnam(sys_get_temp_dir(), 'graphviz');
if ($tmp === false) {
throw new UnexpectedValueException('Unable to get temporary file name for graphviz script');
throw new \UnexpectedValueException('Unable to get temporary file name for graphviz script');
}

$ret = file_put_contents($tmp, $script, LOCK_EX);
if ($ret === false) {
throw new UnexpectedValueException('Unable to write graphviz script to temporary file');
throw new \UnexpectedValueException('Unable to write graphviz script to temporary file');
}

$ret = 0;

$executable = $this->getExecutable();
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 . ')');
throw new \UnexpectedValueException('Unable to invoke "' . $executable .'" to create image file (code ' . $ret . ')');
}

unlink($tmp);
Expand All @@ -229,10 +228,10 @@ public function createImageFile(Graph $graph)
*/
public function createScript(Graph $graph)
{
$directed = false;
$hasDirectedEdges = false;
foreach ($graph->getEdges() as $edge) {
if ($edge instanceof EdgeDirected) {
$directed = true;
$hasDirectedEdges = true;
break;
}
}
Expand All @@ -247,17 +246,11 @@ public function createScript(Graph $graph)
$name = $this->escape($name) . ' ';
}

$script = ($directed ? 'di':'') . 'graph ' . $name . '{' . self::EOL;
$script = ($hasDirectedEdges ? 'di':'') . 'graph ' . $name . '{' . self::EOL;

// add global attributes
$globals = array(
'graph' => 'graphviz.graph.',
'node' => 'graphviz.node.',
'edge' => 'graphviz.edge.',
);

foreach ($globals as $key => $prefix) {
if ($layout = $this->getAttributesPrefixed($graph, $prefix)) {
foreach (array('graph', 'node', 'edge') as $key) {
if ($layout = $this->getAttributesPrefixed($graph, 'graphviz.' . $key . '.')) {
$script .= $this->formatIndent . $key . ' ' . $this->escapeAttributes($layout) . self::EOL;
}
}
Expand Down Expand Up @@ -306,7 +299,7 @@ public function createScript(Graph $graph)
$vid = $vids[\spl_object_hash($vertex)];
$layout = $this->getLayoutVertex($vertex, $vid);

if ($layout || $vertex->getEdges()->isEmpty()) {
if ($layout || !$vertex->getEdges()) {
$script .= $this->formatIndent . $this->escape($vid);
if ($layout) {
$script .= ' ' . $this->escapeAttributes($layout);
Expand All @@ -316,20 +309,19 @@ public function createScript(Graph $graph)
}
}

$edgeop = $directed ? ' -> ' : ' -- ';
$edgeop = $hasDirectedEdges ? ' -> ' : ' -- ';

// add all edges as directed edges
foreach ($graph->getEdges() as $currentEdge) {
$both = $currentEdge->getVertices()->getVector();
$currentStartVertex = $both[0];
$currentTargetVertex = $both[1];
foreach ($graph->getEdges() as $edge) {
$vertices = $edge->getVertices();
assert($vertices[0] instanceof Vertex && $vertices[1] instanceof Vertex);

$script .= $this->formatIndent . $this->escape($vids[\spl_object_hash($currentStartVertex)]) . $edgeop . $this->escape($vids[\spl_object_hash($currentTargetVertex)]);
$script .= $this->formatIndent . $this->escape($vids[\spl_object_hash($vertices[0])]) . $edgeop . $this->escape($vids[\spl_object_hash($vertices[1])]);

$layout = $this->getLayoutEdge($currentEdge);
$layout = $this->getLayoutEdge($edge);

// this edge is not a loop and also points to the opposite direction => this is actually an undirected edge
if ($directed && $currentStartVertex !== $currentTargetVertex && $currentEdge->isConnection($currentTargetVertex, $currentStartVertex)) {
// omit arrow head if this is an undirected edge in a mixed graph
if ($hasDirectedEdges && !$edge instanceof EdgeDirected) {
$layout['dir'] = 'none';
}
if ($layout) {
Expand Down