Revert "Added server state check for bolt."

This reverts commit 8335f8b.
neo4j-php · Jul 15, 2024 · c3e836b · c3e836b
1 parent be650a5
commit c3e836b
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 18 deletions.
diff --git a/src/Bolt/BoltConnection.php b/src/Bolt/BoltConnection.php
@@ -201,6 +201,10 @@ public function begin(?string $database, ?float $timeout, BookmarkHolder $holder
      */
     public function discard(?int $qid): void
     {
+        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.')]);
+        }
+
         $extra = $this->buildResultExtra(null, $qid);
         $response = $this->protocol()
             ->discard($extra)
@@ -217,6 +221,10 @@ 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)
@@ -274,6 +282,10 @@ 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 = [];

diff --git a/tests/Integration/TransactionIntegrationTest.php b/tests/Integration/TransactionIntegrationTest.php
@@ -212,19 +212,28 @@ public function testCommitValidFilledWithInvalidStatement(): void
         self::assertFalse($tsx->isCommitted());
     }
 
-    public function testCommitInvalid(): void
-    {
-        $this->markTestSkipped('Skipped due to ConnectionTimeoutException');
+    // 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());
 //
-//        $this->expectException(Neo4jException::class);
-//        $tsx->commit();
-    }
+//        $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 testRollbackValid(): void
     {
@@ -237,18 +246,28 @@ public function testRollbackValid(): void
 //        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 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());
+//    }
 
 //    /**
 //     * TODO - rework this test