Merge pull request #149 from TomzxForks/bugs/cannot-destroy-vertex-with-loop-edge

Cannot delete a vertex with a loop

Author: clue

src/Vertex.php

@@ -354,7 +354,7 @@ public function getVerticesEdgeFrom()
      */
     public function destroy()
     {
-        foreach ($this->edges as $edge) {
+        foreach ($this->getEdges()->getEdgesDistinct() as $edge) {
             $edge->destroy();
         }
         $this->graph->removeVertex($this);

tests/Edge/EdgeBaseTest.php

@@ -99,6 +99,18 @@ public function testLoop()
         $this->assertSame($this->v1, $edge->getVertexToFrom($this->v1));
     }
 
+    public function testRemoveWithLoop()
+    {
+        $edge = $this->createEdgeLoop();
+
+        $this->assertEquals(array($this->edge, $edge), $this->graph->getEdges()->getVector());
+
+        $edge->destroy();
+
+        $this->assertEquals(array($this->edge), $this->graph->getEdges()->getVector());
+        $this->assertEquals(array($this->v1, $this->v2), $this->graph->getVertices()->getVector());
+    }
+
     protected function createAttributeAware()
     {
         return $this->createEdge();

tests/VertexTest.php

@@ -136,6 +136,32 @@ public function testRemoveInvalidEdge()
         $this->vertex->removeEdge($edge);
     }
 
+    public function testRemoveWithEdgeLoopUndirected()
+    {
+        // 1 -- 1
+        $edge = $this->vertex->createEdge($this->vertex);
+
+        $this->assertEquals(array(1 => $this->vertex), $this->graph->getVertices()->getMap());
+
+        $this->vertex->destroy();
+
+        $this->assertEquals(array(), $this->graph->getVertices()->getVector());
+        $this->assertEquals(array(), $this->graph->getEdges()->getVector());
+    }
+
+    public function testRemoveWithEdgeLoopDirected()
+    {
+        // 1 --> 1
+        $edge = $this->vertex->createEdgeTo($this->vertex);
+
+        $this->assertEquals(array(1 => $this->vertex), $this->graph->getVertices()->getMap());
+
+        $this->vertex->destroy();
+
+        $this->assertEquals(array(), $this->graph->getVertices()->getVector());
+        $this->assertEquals(array(), $this->graph->getEdges()->getVector());
+    }
+
     protected function createAttributeAware()
     {
         return new Vertex(new Graph(), 1);