make CollectionHandler::all work in Batch plus test

hwde · hwde · commit c8023c7bfa43 · 2017-03-09T14:32:36.000+01:00
diff --git a/lib/ArangoDBClient/BatchPart.php b/lib/ArangoDBClient/BatchPart.php
@@ -293,6 +293,7 @@ public function getProcessedResponse()
                 }
                 break;
             case 'cursor':
+            case 'all':
                 $options           = $this->getCursorOptions();
                 $options['_isNew'] = false;
 
diff --git a/lib/ArangoDBClient/CollectionHandler.php b/lib/ArangoDBClient/CollectionHandler.php
@@ -1154,6 +1154,10 @@ public function all($collectionId, array $options = [])
         );
 
         $response = $this->getConnection()->put(Urls::URL_ALL, $this->json_encode_wrapper($body));
+        
+        if ($batchPart = $response->getBatchPart()) {
+            return $batchPart;
+        }
 
         $options = array_merge(['_documentClass' => $this->_documentClass], $options);
 
diff --git a/tests/BatchTest.php b/tests/BatchTest.php
@@ -482,6 +482,44 @@ public function testRemoveByKeysInBatch()
         static::assertTrue($existing == 0, 'Batch removeByKeys not removed all documents!');
     }
 
+    public function testCollectionHandlerAllInBatch()
+    {
+        $connection        = $this->connection;
+        $collection        = $this->collection;
+        $document1         = Document::createFromArray([ "foo" => "bar" ]);
+        $document2         = Document::createFromArray([ "foo" => "baz" ]);
+        $documentHandler   = new DocumentHandler($connection);
+
+        $documentId1 = $documentHandler->save($collection->getName(), $document1);
+        $documentId2 = $documentHandler->save($collection->getName(), $document2);
+
+        $documentIds = [];
+        $cursor = $this->collectionHandler->all($collection->getName());
+        foreach($cursor->getAll() as $doc) {
+            $documentIds[$doc->getId()] = $doc;
+        }
+        
+        $batch = new Batch($this->connection);
+        $batch->startCapture();
+
+        $part = $this->collectionHandler->all($collection->getName());
+
+        static::assertInstanceOf(BatchPart::class, $part);
+        
+        $batch->process();
+
+        $cursor = $batch->getPart(0)->getProcessedResponse();
+        $results = $cursor->getAll();
+        
+        static::assertInstanceOf(Cursor::class, $cursor);
+        static::assertTrue(count($documentIds) == count($results));
+        
+        foreach($results as $result) {
+            static::assertTrue(isset($documentIds[$result->getId()]));
+            static::assertEquals($documentIds[$result->getId()], $result);
+        }
+    }
+
     public function tearDown()
     {
         try {

Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,7 @@ public function getProcessedResponse()`
`293`	`293`	`}`
`294`	`294`	`break;`
`295`	`295`	`case 'cursor':`
	`296`	`+ case 'all':`
`296`	`297`	`$options = $this->getCursorOptions();`
`297`	`298`	`$options['_isNew'] = false;`
`298`	`299`