Merge pull request #151 from frankmayer/devel

frankmayer · frankmayer · commit a46c5624b9e3 · 2013-10-20T01:19:00.000-07:00
A bunch of corrections
diff --git a/lib/triagens/ArangoDb/Document.php b/lib/triagens/ArangoDb/Document.php
@@ -140,7 +140,7 @@ public function __construct(array $options = array())
      * @param array $values  - initial values for document
      * @param array $options - optional, initial options for document
      *
-     * @return Document
+     * @return Document|Edge
      */
     public static function createFromArray(array $values, array $options = array())
     {
diff --git a/lib/triagens/ArangoDb/GraphHandler.php b/lib/triagens/ArangoDb/GraphHandler.php
@@ -91,6 +91,7 @@ public function createGraph(Graph $graph)
         return $graph->getAll();
     }
 
+
     /**
      * Get a graph
      *
@@ -265,7 +266,7 @@ public function getVertex($graphName, $vertexId, array $options = array())
      *
      * @since 1.2
      */
-    public function ReplaceVertex($graphName, $vertexId, Document $document, $options = array())
+    public function replaceVertex($graphName, $vertexId, Document $document, $options = array())
     {
         $options = array_merge(array(self::OPTION_REVISION => false), $options);
 
@@ -317,6 +318,7 @@ public function ReplaceVertex($graphName, $vertexId, Document $document, $option
         return true;
     }
 
+
     /**
      * Update an existing vertex in a graph, identified by graph name and vertex id
      *
@@ -547,7 +549,7 @@ public function getEdge($graphName, $edgeId, array $options = array())
      *
      * @since 1.2
      */
-    public function ReplaceEdge($graphName, $edgeId, $label, Edge $document, $options = array())
+    public function replaceEdge($graphName, $edgeId, $label, Edge $document, $options = array())
     {
         $options = array_merge(array(self::OPTION_REVISION => false), $options);
 
@@ -603,6 +605,7 @@ public function ReplaceEdge($graphName, $edgeId, $label, Edge $document, $option
         return true;
     }
 
+
     /**
      * Update an existing edge in a graph, identified by graph name and edge id
      *
diff --git a/tests/GraphExtendedTest.php b/tests/GraphExtendedTest.php
@@ -11,7 +11,7 @@
 
 /**
  * Class GraphExtendedTest
- * Basic Tests for the Graph API implementation
+ * Extended Tests for the Graph API implementation
  *
  * @property Connection        $connection
  * @property Graph             $graph
@@ -342,11 +342,10 @@ public function testSaveVerticesAndEdgeBetweenThemAndRemoveFirstVertexFirst()
 
 
         // Try to get the edge using GraphHandler
-        // This should return true
+        // This should cause an exception with a code of 404
         try {
             $e       = null;
-            $resultE = $this->graphHandler->getEdge($this->graphName, $this->edge1Name);
-            $this->assertTrue($resultE, 'Did not return true!');
+            $this->graphHandler->getEdge($this->graphName, $this->edge1Name);
         } catch (\Exception $e) {
             // don't bother us... just give us the $e
         }
@@ -443,11 +442,10 @@ public function testGetReplaceUpdateAndRemoveOnNonExistentObjects()
 
 
         // Try to get the edge using GraphHandler
-        // This should return true
+        // This should cause an exception with a code of 404
         try {
             $e       = null;
-            $resultE = $this->graphHandler->getEdge($this->graphName, $this->edge1Name);
-            $this->assertTrue($resultE, 'Did not return true!');
+            $this->graphHandler->getEdge($this->graphName, $this->edge1Name);
         } catch (\Exception $e) {
             // don't bother us... just give us the $e
         }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public function __construct(array $options = array())`
`140`	`140`	`* @param array $values - initial values for document`
`141`	`141`	`* @param array $options - optional, initial options for document`
`142`	`142`	`*`
`143`		`- * @return Document`
	`143`	`+ * @return Document\|Edge`
`144`	`144`	`*/`
`145`	`145`	`public static function createFromArray(array $values, array $options = array())`
`146`	`146`	`{`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ public function createGraph(Graph $graph)`
`91`	`91`	`return $graph->getAll();`
`92`	`92`	`}`
`93`	`93`
	`94`	`+`
`94`	`95`	`/**`
`95`	`96`	`* Get a graph`
`96`	`97`	`*`
`@@ -265,7 +266,7 @@ public function getVertex($graphName, $vertexId, array $options = array())`
`265`	`266`	`*`
`266`	`267`	`* @since 1.2`
`267`	`268`	`*/`
`268`		`- public function ReplaceVertex($graphName, $vertexId, Document $document, $options = array())`
	`269`	`+ public function replaceVertex($graphName, $vertexId, Document $document, $options = array())`
`269`	`270`	`{`
`270`	`271`	`$options = array_merge(array(self::OPTION_REVISION => false), $options);`
`271`	`272`
`@@ -317,6 +318,7 @@ public function ReplaceVertex($graphName, $vertexId, Document $document, $option`
`317`	`318`	`return true;`
`318`	`319`	`}`
`319`	`320`
	`321`	`+`
`320`	`322`	`/**`
`321`	`323`	`* Update an existing vertex in a graph, identified by graph name and vertex id`
`322`	`324`	`*`
`@@ -547,7 +549,7 @@ public function getEdge($graphName, $edgeId, array $options = array())`
`547`	`549`	`*`
`548`	`550`	`* @since 1.2`
`549`	`551`	`*/`
`550`		`- public function ReplaceEdge($graphName, $edgeId, $label, Edge $document, $options = array())`
	`552`	`+ public function replaceEdge($graphName, $edgeId, $label, Edge $document, $options = array())`
`551`	`553`	`{`
`552`	`554`	`$options = array_merge(array(self::OPTION_REVISION => false), $options);`
`553`	`555`
`@@ -603,6 +605,7 @@ public function ReplaceEdge($graphName, $edgeId, $label, Edge $document, $option`
`603`	`605`	`return true;`
`604`	`606`	`}`
`605`	`607`
	`608`	`+`
`606`	`609`	`/**`
`607`	`610`	`* Update an existing edge in a graph, identified by graph name and edge id`
`608`	`611`	`*`