fixed regression into message exception handling

Author: transistive

src/Bolt/BoltResult.php

@@ -14,10 +14,13 @@
 namespace Laudis\Neo4j\Bolt;
 
 use function array_splice;
+use Bolt\error\MessageException;
 use function count;
 use Generator;
+use function in_array;
 use Iterator;
 use Laudis\Neo4j\Contracts\FormatterInterface;
+use Laudis\Neo4j\Exception\Neo4jException;
 
 /**
  * @psalm-import-type BoltCypherStats from FormatterInterface
@@ -99,7 +102,11 @@ public function consume(): array
 
     private function fetchResults(): void
     {
-        $meta = $this->connection->pull($this->qid, $this->fetchSize);
+        try {
+            $meta = $this->connection->pull($this->qid, $this->fetchSize);
+        } catch (MessageException $e) {
+            $this->handleMessageException($e);
+        }
 
         /** @var list<list> $rows */
         $rows = array_splice($meta, 0, count($meta) - 1);
@@ -148,6 +155,25 @@ public function __destruct()
 
     public function discard(): void
     {
-        $this->connection->discard($this->qid === -1 ? null : $this->qid);
+        try {
+            $this->connection->discard($this->qid === -1 ? null : $this->qid);
+        } catch (MessageException $e) {
+            $this->handleMessageException($e);
+        }
+    }
+
+    /**
+     * @throws Neo4jException
+     *
+     * @return never
+     */
+    private function handleMessageException(MessageException $e): void
+    {
+        $exception = Neo4jException::fromMessageException($e);
+        if (!($exception->getClassification() === 'ClientError' && $exception->getCategory() === 'Request')) {
+            $this->connection->reset();
+        }
+
+        throw $exception;
     }
 }

tests/Integration/ComplexQueryTest.php

@@ -13,7 +13,6 @@
 
 namespace Laudis\Neo4j\Tests\Integration;
 
-use Bolt\error\MessageException;
 use Generator;
 use function getenv;
 use InvalidArgumentException;
@@ -30,6 +29,7 @@
 use Laudis\Neo4j\ParameterHelper;
 use Laudis\Neo4j\Types\CypherMap;
 use Laudis\Neo4j\Types\Node;
+use const PHP_EOL;
 use function str_starts_with;
 use Throwable;
 
@@ -479,14 +479,23 @@ public function testConstraintHandling(string $alias): void
     {
         $session = $this->getClient()->getDriver($alias)->createSession();
 
+        $session->run('MATCH (x) DETACH DELETE x');
         $session->run("CREATE (test:Test{id: '123'})");
+
+        // We cannot use IF EXISTS on version 4.0
+        try {
+            $session->run('DROP CONSTRAINT ON (test:Test) ASSERT test.id IS UNIQUE');
+        } catch (Throwable $e) {
+            echo $e->getMessage().PHP_EOL;
+        }
+
         try {
             $session->run('CREATE CONSTRAINT ON (test:Test) ASSERT test.id IS UNIQUE');
         } catch (Throwable $e) {
-            // We cannot use IF EXISTS on version 4.0
-            $session->run('DROP CONSTRAINT ON (test:Test) ASSERT test.id IS UNIQUE');
+            echo $e->getMessage().PHP_EOL;
         }
-        $this->expectException(MessageException::class);
+
+        $this->expectException(Neo4jException::class);
         $session->run("CREATE (test:Test {id: '123'}) RETURN test");
     }