Remove loading of first batch from constructor

sandrokeil · sandrokeil · commit d14ea1d862cd · 2017-11-25T00:35:49.000+01:00
- This makes calling rewind() explicit
- If an exception is thrown, the response can be retrieved
diff --git a/phpstorm-stubs/arangodb/arangodb.php b/phpstorm-stubs/arangodb/arangodb.php
@@ -235,10 +235,17 @@ public static function fromJson(string $json): Vpack
     /**
      * Handles queries
      *
+     * You must call rewind first to get a result
+     *
      * @link https://github.com/sandrokeil/arangodb-php-driver/blob/master/src/cursorIterator.h
      */
     final class Cursor implements \Countable
     {
+        public CONST ENTRY_TYPE = 0;
+        public CONST ENTRY_TYPE_JSON = 100;
+        public CONST ENTRY_TYPE_ARRAY = 101;
+        public CONST ENTRY_TYPE_OBJECT = 102;
+
         /**
          * Returns the number of results
          *
@@ -249,6 +256,7 @@ final class Cursor implements \Countable
         public function count()
         {
         }
+
         /**
          * Return the current element
          * @link http://php.net/manual/en/iterator.current.php
@@ -287,15 +295,20 @@ public function valid()
         }
 
         /**
-         * Rewind the Iterator to the first element
-         *
-         * If iteration has already begun, this will throw an exception.
+         * Rewind the Iterator to the first element and resets the cursor
          *
          * @link http://php.net/manual/en/iterator.rewind.php
          * @return void Any returned value is ignored.
          */
         public function rewind()
         {
         }
+
+        /**
+        * Rewinds the cursor and returns the result
+        */
+        public function toArray(): array
+        {
+        }
     }
 }
diff --git a/src/cursor.cpp b/src/cursor.cpp
@@ -4,7 +4,6 @@ namespace arangodb { namespace fuerte { namespace php {
 
     Cursor::Cursor(Connection* connection, Vpack* vpack): vpack(*vpack), connection(connection)
     {
-        this->rewind();
     }
 
     void Cursor::setOption(int option, int value)
@@ -128,8 +127,8 @@ namespace arangodb { namespace fuerte { namespace php {
     }
 
     Php::Value Cursor::toArray() {
+        this->rewind();
         Php::Array result;
-
         int counter = 0;
         while(this->valid()) {
             result[counter++] = this->current();
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -260,6 +260,7 @@ public function it_rewinds_cursor_multiple_times()
             'batchSize' => 10
         ]));
 
+        $cursor->rewind();
         $iterations = 0;
         $dataSet1 = [];
         $dataSet2 = [];
@@ -295,6 +296,7 @@ public function it_gets_raw_response_from_cursor()
             'batchSize' => 10
         ]));
 
+        $cursor->rewind();
         $response = $cursor->getResponse();
 
         $this->assertInstanceOf(\ArangoDb\Response::class, $response);
@@ -314,6 +316,7 @@ public function it_rewinds_cursor_half_way_through()
             'batchSize' => 10
         ]));
 
+        $cursor->rewind();
         $iterations = 0;
         $dataSet1 = [];
         $dataSet2 = [];

Original file line number	Diff line number	Diff line change
`@@ -235,10 +235,17 @@ public static function fromJson(string $json): Vpack`
`235`	`235`	`/**`
`236`	`236`	`* Handles queries`
`237`	`237`	`*`
	`238`	`+ * You must call rewind first to get a result`
	`239`	`+ *`
`238`	`240`	`* @link https://github.com/sandrokeil/arangodb-php-driver/blob/master/src/cursorIterator.h`
`239`	`241`	`*/`
`240`	`242`	`final class Cursor implements \Countable`
`241`	`243`	`{`
	`244`	`+ public CONST ENTRY_TYPE = 0;`
	`245`	`+ public CONST ENTRY_TYPE_JSON = 100;`
	`246`	`+ public CONST ENTRY_TYPE_ARRAY = 101;`
	`247`	`+ public CONST ENTRY_TYPE_OBJECT = 102;`
	`248`	`+`
`242`	`249`	`/**`
`243`	`250`	`* Returns the number of results`
`244`	`251`	`*`
`@@ -249,6 +256,7 @@ final class Cursor implements \Countable`
`249`	`256`	`public function count()`
`250`	`257`	`{`
`251`	`258`	`}`
	`259`	`+`
`252`	`260`	`/**`
`253`	`261`	`* Return the current element`
`254`	`262`	`* @link http://php.net/manual/en/iterator.current.php`
`@@ -287,15 +295,20 @@ public function valid()`
`287`	`295`	`}`
`288`	`296`
`289`	`297`	`/**`
`290`		`- * Rewind the Iterator to the first element`
`291`		`- *`
`292`		`- * If iteration has already begun, this will throw an exception.`
	`298`	`+ * Rewind the Iterator to the first element and resets the cursor`
`293`	`299`	`*`
`294`	`300`	`* @link http://php.net/manual/en/iterator.rewind.php`
`295`	`301`	`* @return void Any returned value is ignored.`
`296`	`302`	`*/`
`297`	`303`	`public function rewind()`
`298`	`304`	`{`
`299`	`305`	`}`
	`306`	`+`
	`307`	`+ /**`
	`308`	`+ * Rewinds the cursor and returns the result`
	`309`	`+ */`
	`310`	`+ public function toArray(): array`
	`311`	`+ {`
	`312`	`+ }`
`300`	`313`	`}`
`301`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ namespace arangodb { namespace fuerte { namespace php {`
`4`	`4`
`5`	`5`	`Cursor::Cursor(Connection* connection, Vpack* vpack): vpack(*vpack), connection(connection)`
`6`	`6`	`{`
`7`		`- this->rewind();`
`8`	`7`	`}`
`9`	`8`
`10`	`9`	`void Cursor::setOption(int option, int value)`
`@@ -128,8 +127,8 @@ namespace arangodb { namespace fuerte { namespace php {`
`128`	`127`	`}`
`129`	`128`
`130`	`129`	`Php::Value Cursor::toArray() {`
	`130`	`+ this->rewind();`
`131`	`131`	`Php::Array result;`
`132`		`-`
`133`	`132`	`int counter = 0;`
`134`	`133`	`while(this->valid()) {`
`135`	`134`	`result[counter++] = this->current();`