fixed usage of fetchSize for amount bigger than fetched size.

Author: stefanak-michal

src/Types/AbstractCypherSequence.php

@@ -443,7 +443,7 @@ public function valid(): bool
     public function rewind(): void
     {
         $this->currentPosition = max(
-            $this->currentPosition - $this->cacheLimit,
+            $this->currentPosition - $this->cacheLimit - 1,
             0
         );
     }
@@ -481,7 +481,7 @@ public function key()
      */
     protected function cacheKey()
     {
-        return $this->keyCache[$this->currentPosition % $this->cacheLimit];
+        return $this->keyCache[$this->currentPosition % max($this->cacheLimit - 1, 1)];
     }
 
     /**

tests/Integration/ClientIntegrationTest.php

@@ -313,22 +313,36 @@ public function testValidConnectionCheck(string $alias): void
 
     /**
      * @dataProvider connectionAliases
+     * @param string $alias
      */
-    public function testFetchSize(string $connection): void
+    public function testFetchSize(string $alias): void
     {
-        $session = $this->getClient()->getDriver($connection)->createSession(SessionConfiguration::default()->withFetchSize(1));
+        $this->fetchSize($alias, 1);
+        $this->fetchSize($alias, 4);
+        $this->fetchSize($alias, 10);
+    }
+
+    /**
+     * @param string $connection
+     * @param int $fetchSize
+     * @return void
+     */
+    public function fetchSize(string $connection, int $fetchSize): void
+    {
+        $session = $this->getClient()->getDriver($connection)->createSession(SessionConfiguration::default()->withFetchSize($fetchSize));
         $session->run('MATCH (x) DETACH DELETE x');
 
-        // Add 4000 user nodes
-        for ($i = 0; $i < 4; ++$i) {
+        $nodesAmount = $fetchSize * 4;
+        // Add user nodes
+        for ($i = 0; $i < $nodesAmount; ++$i) {
             $session->run('CREATE (user:User)');
         }
 
         // Confirm that the database contains 4000 unique user nodes
         $userCountResults = $session->run('MATCH (user:User) RETURN COUNT(DISTINCT(ID(user))) as user_count');
         $userCount = $userCountResults->getAsCypherMap(0)->getAsInt('user_count');
 
-        $this->assertEquals(4, $userCount);
+        $this->assertEquals($nodesAmount, $userCount);
 
         // Retrieve the ids of all user nodes
         $results = $session->run('MATCH (user:User) RETURN ID(user) AS id');
@@ -339,12 +353,12 @@ public function testFetchSize(string $connection): void
             $userIds[] = $result->get('id');
         }
 
-        $this->assertCount(4, $userIds);
+        $this->assertCount($nodesAmount, $userIds);
 
         // Check if we have any duplicate ids by removing duplicate values
         // from the array.
         $uniqueUserIds = array_unique($userIds);
 
-        $this->assertCount(4, $uniqueUserIds);
+        $this->assertCount($nodesAmount, $uniqueUserIds);
     }
 }