Added server state check for bolt.

Author: stefanak-michal

composer.json

@@ -28,7 +28,7 @@
         "psr/http-factory": "^1.0",
         "psr/http-client": "^1.0",
         "php-http/message": "^1.0",
-        "stefanak-michal/bolt": "^7.0",
+        "stefanak-michal/bolt": "^7.0.1",
         "symfony/polyfill-php80": "^1.2",
         "psr/simple-cache": ">=2.0",
         "ext-json": "*",

src/Bolt/BoltConnection.php

@@ -26,6 +26,7 @@
 use Laudis\Neo4j\Contracts\FormatterInterface;
 use Laudis\Neo4j\Databags\BookmarkHolder;
 use Laudis\Neo4j\Databags\DatabaseInfo;
+use Laudis\Neo4j\Databags\Neo4jError;
 use Laudis\Neo4j\Enum\AccessMode;
 use Laudis\Neo4j\Enum\ConnectionProtocol;
 use Laudis\Neo4j\Exception\Neo4jException;
@@ -166,11 +167,10 @@ public function consumeResults(): void
      */
     public function reset(): void
     {
-        $response = $this->protocol()->reset()
+        $response = $this->protocol()
+            ->reset()
             ->getResponse();
-
         $this->assertNoFailure($response);
-
         $this->subscribedResults = [];
     }
 
@@ -182,12 +182,15 @@ public function reset(): void
     public function begin(?string $database, ?float $timeout, BookmarkHolder $holder): void
     {
         $this->consumeResults();
-        $extra = $this->buildRunExtra($database, $timeout, $holder, AccessMode::WRITE());
 
+        if ($this->protocol()->serverState !== ServerState::READY) {
+            throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Request.Invalid', 'Message \'BEGIN\' cannot be handled by a session which isn\'t in the READY state.')]);
+        }
+
+        $extra = $this->buildRunExtra($database, $timeout, $holder, AccessMode::WRITE());
         $response = $this->protocol()
             ->begin($extra)
             ->getResponse();
-
         $this->assertNoFailure($response);
     }
 
@@ -198,12 +201,14 @@ public function begin(?string $database, ?float $timeout, BookmarkHolder $holder
      */
     public function discard(?int $qid): void
     {
-        $extra = $this->buildResultExtra(null, $qid);
-        $bolt = $this->protocol();
+        if (!in_array($this->protocol()->serverState, [ServerState::STREAMING, ServerState::TX_STREAMING], true)) {
+            throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Request.Invalid', 'Message \'DISCARD\' cannot be handled by a session which isn\'t in the STREAMING|TX_STREAMING state.')]);
+        }
 
-        $response = $bolt->discard($extra)
+        $extra = $this->buildResultExtra(null, $qid);
+        $response = $this->protocol()
+            ->discard($extra)
             ->getResponse();
-
         $this->assertNoFailure($response);
     }
 
@@ -216,12 +221,15 @@ public function discard(?int $qid): void
      */
     public function run(string $text, array $parameters, ?string $database, ?float $timeout, BookmarkHolder $holder, ?AccessMode $mode): array
     {
+        if (!in_array($this->protocol()->serverState, [ServerState::READY, ServerState::TX_READY, ServerState::TX_STREAMING], true)) {
+            throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Request.Invalid', 'Message \'RUN\' cannot be handled by a session which isn\'t in the READY|TX_READY|TX_STREAMING state.')]);
+        }
+
         $extra = $this->buildRunExtra($database, $timeout, $holder, $mode);
-        $response = $this->protocol()->run($text, $parameters, $extra)
+        $response = $this->protocol()
+            ->run($text, $parameters, $extra)
             ->getResponse();
-
         $this->assertNoFailure($response);
-
         /** @var BoltMeta */
         return $response->content;
     }
@@ -234,10 +242,14 @@ public function run(string $text, array $parameters, ?string $database, ?float $
     public function commit(): void
     {
         $this->consumeResults();
+
+        if ($this->protocol()->serverState !== ServerState::TX_READY) {
+            throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Request.Invalid', 'Message \'COMMIT\' cannot be handled by a session which isn\'t in the TX_READY state.')]);
+        }
+
         $response = $this->protocol()
             ->commit()
             ->getResponse();
-
         $this->assertNoFailure($response);
     }
 
@@ -249,10 +261,14 @@ public function commit(): void
     public function rollback(): void
     {
         $this->consumeResults();
+
+        if ($this->protocol()->serverState !== ServerState::TX_READY) {
+            throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Request.Invalid', 'Message \'ROLLBACK\' cannot be handled by a session which isn\'t in the TX_READY state.')]);
+        }
+
         $response = $this->protocol()
             ->rollback()
             ->getResponse();
-
         $this->assertNoFailure($response);
     }
 
@@ -270,13 +286,16 @@ public function protocol(): V4_4|V5|V5_3|V5_4
      */
     public function pull(?int $qid, ?int $fetchSize): array
     {
+        if (!in_array($this->protocol()->serverState, [ServerState::STREAMING, ServerState::TX_STREAMING], true)) {
+            throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Request.Invalid', 'Message \'PULL\' cannot be handled by a session which isn\'t in the STREAMING|TX_STREAMING state.')]);
+        }
+
         $extra = $this->buildResultExtra($fetchSize, $qid);
 
         $tbr = [];
         /** @var Response $response */
         foreach ($this->protocol()->pull($extra)->getResponses() as $response) {
             $this->assertNoFailure($response);
-
             $tbr[] = $response->content;
         }
 

src/Bolt/BoltUnmanagedTransaction.php

@@ -71,14 +71,8 @@ public function commit(iterable $statements = []): CypherList
             }
         });
 
-        try {
-            $this->connection->commit();
-            $this->isCommitted = true;
-        } catch (Throwable $e) {
-            $this->isCommitted = false;
-            $this->isRolledBack = true;
-            throw $e;
-        }
+        $this->connection->commit();
+        $this->isCommitted = true;
 
         return $tbr;
     }

tests/Integration/TransactionIntegrationTest.php

@@ -13,13 +13,9 @@
 
 namespace Laudis\Neo4j\Tests\Integration;
 
-use Laudis\Neo4j\Bolt\BoltDriver;
-use Laudis\Neo4j\Bolt\Connection;
-use Laudis\Neo4j\Bolt\ConnectionPool;
 use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Exception\Neo4jException;
-use ReflectionClass;
-use Throwable;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 
 final class TransactionIntegrationTest extends EnvironmentAwareIntegrationTest
 {
@@ -215,28 +211,18 @@ public function testCommitValidFilledWithInvalidStatement(): void
         self::assertFalse($tsx->isCommitted());
     }
 
-    // TODO commit on READY state cause stuck neo4j connection on older version and disconnect at newer
-//    public function testCommitInvalid(): void
-//    {
-//        $tsx = $this->getSession()->beginTransaction();
-//        $tsx->commit();
-//
-//        self::assertTrue($tsx->isFinished());
-//        self::assertFalse($tsx->isRolledBack());
-//        self::assertTrue($tsx->isCommitted());
-//
-//        $exception = false;
-//        try {
-//            $tsx->commit();
-//        } catch (Throwable) {
-//            $exception = true;
-//        }
-//        self::assertTrue($exception);
-//
-//        self::assertTrue($tsx->isFinished());
-//        self::assertTrue($tsx->isRolledBack());
-//        self::assertFalse($tsx->isCommitted());
-//    }
+    public function testCommitInvalid(): void
+    {
+        $tsx = $this->getSession()->beginTransaction();
+        $tsx->commit();
+
+        self::assertTrue($tsx->isFinished());
+        self::assertFalse($tsx->isRolledBack());
+        self::assertTrue($tsx->isCommitted());
+
+        $this->expectException(Neo4jException::class);
+        $tsx->commit();
+    }
 
     public function testRollbackValid(): void
     {
@@ -248,28 +234,18 @@ public function testRollbackValid(): void
         self::assertFalse($tsx->isCommitted());
     }
 
-    // TODO rollback on READY state cause stuck neo4j connection on older version and disconnect at newer
-//    public function testRollbackInvalid(): void
-//    {
-//        $tsx = $this->getSession()->beginTransaction();
-//        $tsx->rollback();
-//
-//        self::assertTrue($tsx->isFinished());
-//        self::assertTrue($tsx->isRolledBack());
-//        self::assertFalse($tsx->isCommitted());
-//
-//        $exception = false;
-//        try {
-//            $tsx->rollback();
-//        } catch (Throwable) {
-//            $exception = true;
-//        }
-//        self::assertTrue($exception);
-//
-//        self::assertTrue($tsx->isFinished());
-//        self::assertTrue($tsx->isRolledBack());
-//        self::assertFalse($tsx->isCommitted());
-//    }
+    public function testRollbackInvalid(): void
+    {
+        $tsx = $this->getSession()->beginTransaction();
+        $tsx->rollback();
+
+        self::assertTrue($tsx->isFinished());
+        self::assertTrue($tsx->isRolledBack());
+        self::assertFalse($tsx->isCommitted());
+
+        $this->expectException(Neo4jException::class);
+        $tsx->rollback();
+    }
 
 //    /**
 //     * TODO - rework this test
@@ -306,9 +282,7 @@ public function testRollbackValid(): void
 //        self::assertCount(3, $cache[$key]);
 //    }
 
-    /**
-     * @doesNotPerformAssertions
-     */
+    #[DoesNotPerformAssertions]
     public function testTransactionRunNoConsumeResult(): void
     {
         $tsx = $this->getSession()->beginTransaction([]);
@@ -317,9 +291,7 @@ public function testTransactionRunNoConsumeResult(): void
         $tsx->commit();
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
+    #[DoesNotPerformAssertions]
     public function testTransactionRunNoConsumeButSaveResult(): void
     {
         $tsx = $this->getSession()->beginTransaction([]);