Merge branch 'hwde-byExample' into devel

jsteemann · jsteemann · commit add7a102a969 · 2017-03-09T15:24:29.000+01:00
diff --git a/lib/ArangoDBClient/BatchPart.php b/lib/ArangoDBClient/BatchPart.php
@@ -246,6 +246,16 @@ public function getProcessedResponse()
 
         $response = $this->getResponse();
         switch ($this->_type) {
+            case 'first':
+                $json             = $response->getJson();
+                if (!isset($json['error']) || $json['error'] === false) {
+                    $options           = $this->getCursorOptions();
+                    $options['_isNew'] = false;
+                    $response          = $_documentClass::createFromArray($json['document'], $options);
+                } else {
+                    $response          = false;
+                }
+                break;
             case 'getdocument':
                 $json              = $response->getJson();
                 $options           = $this->getCursorOptions();
@@ -294,8 +304,9 @@ public function getProcessedResponse()
                 break;
             case 'cursor':
             case 'all':
-                $options           = $this->getCursorOptions();
-                $options['_isNew'] = false;
+            case 'by':
+                $options          = $this->getCursorOptions();
+                $options['isNew'] = false;
 
                 $options  = array_merge(['_documentClass' => $this->_documentClass], $options);
                 $response = new Cursor($this->_batch->getConnection(), $response->getJson(), $options);
diff --git a/lib/ArangoDBClient/CollectionHandler.php b/lib/ArangoDBClient/CollectionHandler.php
@@ -1255,7 +1255,11 @@ public function byExample($collectionId, $document, array $options = [])
 
         $response = $this->getConnection()->put(Urls::URL_EXAMPLE, $this->json_encode_wrapper($body));
 
-        $options['_isNew'] = false;
+        if ($batchPart = $response->getBatchPart()) {
+            return $batchPart;
+        }
+
+        $options['isNew'] = false;
 
         $options = array_merge(['_documentClass' => $this->_documentClass], $options);
 
@@ -1305,6 +1309,11 @@ public function firstExample($collectionId, $document, array $options = [])
         ];
 
         $response = $this->getConnection()->put(Urls::URL_FIRST_EXAMPLE, $this->json_encode_wrapper($data));
+        
+        if ($batchPart = $response->getBatchPart()) {
+            return $batchPart;
+        }
+        
         $data     = $response->getJson();
 
         $options['_isNew'] = false;
