Support extending Vertex by registering to Graph within its ctor

Author: Christian Lück

lib/Fhaculty/Graph/Graph.php

@@ -77,19 +77,12 @@ public function createVertex($id = NULL, $returnDuplicate = false)
         // no ID given
         if ($id === NULL) {
             $id = $this->getNextId();
-        } elseif (!is_int($id) && !is_string($id)) {
-            throw new InvalidArgumentException('Vertex ID has to be of type integer or string');
         }
-        if ($this->vertices->hasVertexId($id)) {
-            if ($returnDuplicate) {
-                return $this->vertices->getVertexId($id);
-            }
-            throw new OverflowException('ID must be unique');
+        if ($returnDuplicate && $this->vertices->hasVertexId($id)) {
+            return $this->vertices->getVertexId($id);
         }
-        $vertex = new Vertex($id, $this);
-        $this->verticesStorage[$id] = $vertex;
 
-        return $vertex;
+        return new Vertex($id, $this);
     }
 
     /**
@@ -110,7 +103,6 @@ public function createVertexClone(Vertex $originalVertex)
         $newVertex->setLayout($originalVertex->getLayout());
         $newVertex->setBalance($originalVertex->getBalance());
         $newVertex->setGroup($originalVertex->getGroup());
-        $this->verticesStorage[$id] = $newVertex;
 
         return $newVertex;
     }
@@ -264,7 +256,7 @@ public function createVertices($n)
         $vertices = array();
         if (is_int($n) && $n >= 0) {
             for ($id = $this->getNextId(), $n += $id; $id < $n; ++$id) {
-                $vertices[$id] = $this->verticesStorage[$id] = new Vertex($id, $this);
+                $vertices[$id] = new Vertex($id, $this);
             }
         } elseif (is_array($n)) {
             // array given => check to make sure all given IDs are available (atomic operation)
@@ -283,7 +275,7 @@ public function createVertices($n)
 
             // actually create all requested vertices
             foreach ($n as $id) {
-                $vertices[$id] = $this->verticesStorage[$id] = new Vertex($id, $this);
+                $vertices[$id] = new Vertex($id, $this);
             }
         } else {
             throw new InvalidArgumentException('Invalid number of vertices given. Must be non-negative integer or an array of Vertex IDs');
@@ -349,6 +341,22 @@ public function getVertexFirst()
         return $this->vertices->getVertexFirst();
     }
 
+    /**
+     * adds a new Vertex to the Graph (MUST NOT be called manually!)
+     *
+     * @param  Vertex $vertex instance of the new Vertex
+     * @return void
+     * @private
+     * @see self::createVertex() instead!
+     */
+    public function addVertex(Vertex $vertex)
+    {
+        if (isset($this->verticesStorage[$vertex->getId()])) {
+            throw new OverflowException('ID must be unique');
+        }
+        $this->verticesStorage[$vertex->getId()] = $vertex;
+    }
+
     /**
      * adds a new Edge to the Graph (MUST NOT be called manually!)
      *

lib/Fhaculty/Graph/Vertex.php

@@ -43,16 +43,22 @@ class Vertex extends Layoutable implements EdgesAggregate
     private $group = 0;
 
     /**
-     * Creates a Vertex (MUST NOT BE CALLED MANUALLY!)
+     * Create a new Vertex
      *
      * @param string|int $id    identifier used to uniquely identify this vertex in the graph
      * @param Graph      $graph graph to be added to
      * @see Graph::createVertex() to create new vertices
      */
     public function __construct($id, Graph $graph)
     {
+        if (!is_int($id) && !is_string($id)) {
+            throw new InvalidArgumentException('Vertex ID has to be of type integer or string');
+        }
+
         $this->id = $id;
         $this->graph = $graph;
+
+        $graph->addVertex($this);
     }
 
     /**