Use TypeSupport and CursorType dependency for Statement class

Author: sandrokeil

CHANGELOG.md

@@ -4,19 +4,19 @@
 
 ### Added
 
-* Nothing
+* Dependencies `TypeSupport` and `CursorType` for `Statement` class
 
 ### Deprecated
 
 * Nothing
 
 ### Removed
 
-* Nothing
+* Dependencies `ClientInterface` and `RequestInterface` from `Statement` class
 
 ### Fixed
 
-* Nothing
+* Cursor id can be null in `Statement` class
 
 ## 0.2.0 (2020-06-17)
 

example/aql-query.php

@@ -55,8 +55,7 @@
     foreach ($statements as $query => $bindVars) {
         $statement = new Statement(
             $client,
-            Cursor::create($query, $bindVars, 1000, true)->toRequest($requestFactory, $streamFactory),
-            $requestFactory,
+            Cursor::create($query, $bindVars, 1000, true),
             $streamHandlerFactory
         );
 

src/Exception/NoCursorId.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Sandro Keil (https://sandro-keil.de)
+ *
+ * @link      http://github.com/sandrokeil/arangodb-php-client for the canonical source repository
+ * @copyright Copyright (c) 2018-2020 Sandro Keil
+ * @license   http://github.com/sandrokeil/arangodb-php-client/blob/master/LICENSE.md New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ArangoDb\Exception;
+
+use ArangoDb\Type\Type;
+
+final class NoCursorId extends RuntimeException
+{
+    /**
+     * @var Type
+     */
+    private $type;
+
+    public static function forType(Type $type): self
+    {
+        $self = new self('There is no cursor id to get more results.');
+
+        $self->type = $type;
+        return $self;
+    }
+
+    public function getType(): Type
+    {
+        return $this->type;
+    }
+}

src/Exception/ServerException.php

@@ -9,8 +9,8 @@
 
 namespace ArangoDb\Exception;
 
+use ArangoDb\Type\Type;
 use Psr\Http\Client\ClientExceptionInterface;
-use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 final class ServerException extends RuntimeException implements ClientExceptionInterface
@@ -21,24 +21,24 @@ final class ServerException extends RuntimeException implements ClientExceptionI
     private $response;
 
     /**
-     * @var RequestInterface
+     * @var Type
      */
-    private $request;
+    private $type;
 
-    public static function with(RequestInterface $request, ResponseInterface $response): self
+    public static function with(Type $type, ResponseInterface $response): self
     {
         $self = new self(
             sprintf('Response with status code "%s" was returned.', $response->getStatusCode()),
             $response->getStatusCode()
         );
-        $self->request = $request;
+        $self->type = $type;
         $self->response = $response;
         return $self;
     }
 
-    public function getRequest(): RequestInterface
+    public function getType(): Type
     {
-        return $this->request;
+        return $this->type;
     }
 
     public function getResponse(): ResponseInterface

src/Statement/Statement.php

@@ -9,36 +9,29 @@
 
 namespace ArangoDb\Statement;
 
+use ArangoDb\Exception\NoCursorId;
 use ArangoDb\Exception\ServerException;
-use ArangoDb\Http\Url;
+use ArangoDb\Http\TypeSupport;
+use ArangoDb\Type\CursorType;
 use Countable;
-use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Iterator;
 use Psr\Http\Client\ClientExceptionInterface;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestFactoryInterface;
-use Psr\Http\Message\RequestInterface;
 
 /**
  * @implements Iterator<int, mixed>
  */
 final class Statement implements QueryResult, Iterator, Countable
 {
     /**
-     * @var ClientInterface
+     * @var TypeSupport
      */
     private $client;
 
     /**
-     * @var RequestFactoryInterface
+     * @var CursorType
      */
-    private $requestFactory;
-
-    /**
-     * @var RequestInterface
-     */
-    private $request;
+    private $cursor;
 
     /**
      * @var StreamHandler
@@ -60,20 +53,17 @@ final class Statement implements QueryResult, Iterator, Countable
     /**
      * Query is executed on first access
      *
-     * @param ClientInterface $client - connection to be used
-     * @param RequestInterface $request Cursor request
-     * @param RequestFactoryInterface $requestFactory
+     * @param TypeSupport $client - connection to be used
+     * @param CursorType $cursor
      * @param StreamHandlerFactoryInterface $streamHandlerFactory
      */
     public function __construct(
-        ClientInterface $client,
-        RequestInterface $request,
-        RequestFactoryInterface $requestFactory,
+        TypeSupport $client,
+        CursorType $cursor,
         StreamHandlerFactoryInterface $streamHandlerFactory
     ) {
         $this->client = $client;
-        $this->request = $request;
-        $this->requestFactory = $requestFactory;
+        $this->cursor = $cursor;
         $this->streamHandlerFactory = $streamHandlerFactory;
     }
 
@@ -85,15 +75,17 @@ public function __construct(
      */
     private function fetchOutstanding(): void
     {
-        $request = $this->fetches === 0
-            ? $this->request
-            : $this->requestFactory->createRequest(
-                RequestMethodInterface::METHOD_PUT,
-                Url::CURSOR . '/' . $this->streamHandler->cursorId()
-            );
-
-        $request->getBody()->rewind();
-        $response = $this->client->sendRequest($request);
+        if ($this->fetches === 0) {
+            $request = $this->cursor;
+        } else {
+            $cursorId = $this->streamHandler->cursorId();
+
+            if ($cursorId === null) {
+                throw NoCursorId::forType($this->cursor);
+            }
+            $request = $this->cursor::nextBatch($cursorId);
+        }
+        $response = $this->client->sendType($request);
 
         $httpStatusCode = $response->getStatusCode();
 

test/Statement/StatementTest.php

@@ -28,8 +28,7 @@ public function it_returns_data_with_batch_size(): void
                 'FOR i IN 1..' . $count . ' RETURN {"_key": i+1}',
                 [],
                 $count
-            )->toRequest($this->requestFactory, $this->streamFactory),
-            $this->requestFactory,
+            ),
             $this->streamHandlerFactory
         );
         $this->assertEquals(0, $statement->fetches());
@@ -58,8 +57,7 @@ public function it_returns_all_data_with_batch_size(): void
                 'FOR i IN 0..99 RETURN {"_key": i+1}',
                 [],
                 10
-            )->toRequest($this->requestFactory, $this->streamFactory),
-            $this->requestFactory,
+            ),
             $this->streamHandlerFactory
         );
         $this->assertEquals(0, $statement->fetches());
@@ -88,8 +86,7 @@ public function it_supports_rewind(): void
                 'FOR i IN 0..99 RETURN {"_key": i+1}',
                 [],
                 10
-            )->toRequest($this->requestFactory, $this->streamFactory),
-            $this->requestFactory,
+            ),
             $this->streamHandlerFactory
         );
 
@@ -126,8 +123,7 @@ public function it_supports_single_object(): void
     {
         $statement = new Statement(
             $this->client,
-            Cursor::create('RETURN {"_key": 1}')->toRequest($this->requestFactory, $this->streamFactory),
-            $this->requestFactory,
+            Cursor::create('RETURN {"_key": 1}'),
             $this->streamHandlerFactory
         );
 
@@ -144,8 +140,7 @@ public function it_supports_arbitrary_data(): void
     {
         $statement = new Statement(
             $this->client,
-            Cursor::create('RETURN "test"')->toRequest($this->requestFactory, $this->streamFactory),
-            $this->requestFactory,
+            Cursor::create('RETURN "test"'),
             $this->streamHandlerFactory
         );
 
@@ -169,8 +164,7 @@ public function it_supports_count(): void
                 true,
                 null,
                 ['fullCount' => true]
-            )->toRequest($this->requestFactory, $this->streamFactory),
-            $this->requestFactory,
+            ),
             $this->streamHandlerFactory
         );
 
@@ -195,8 +189,7 @@ public function it_fetches_data(): void
                 'FOR i IN 0..99  LIMIT 50 RETURN {"_key": i+1}',
                 [],
                 10
-            )->toRequest($this->requestFactory, $this->streamFactory),
-            $this->requestFactory,
+            ),
             $this->streamHandlerFactory
         );