Cleanup tests and fix broken regressions

Author: transistive

composer.json

@@ -84,6 +84,6 @@
     "scripts": {
         "fix-cs": "./vendor/bin/php-cs-fixer fix",
         "check-cs": "./vendor/bin/php-cs-fixer fix --dry-run",
-        "psalm": "./vendor/bin/psalm"
+        "psalm": "./vendor/bin/psalm --show-info"
     }
 }

src/Bolt/BoltConnection.php

@@ -128,7 +128,7 @@ public function getProtocol(): ConnectionProtocol
     /**
      * @psalm-mutation-free
      */
-    public function getAccessMode(): AccessMode
+    public function getAccessMode(): ?AccessMode
     {
         return $this->config->getAccessMode();
     }
@@ -217,7 +217,7 @@ public function begin(?string $database, ?float $timeout, BookmarkHolder $holder
     {
         $this->consumeResults();
 
-        $extra = $this->buildRunExtra($database, $timeout, $holder, AccessMode::WRITE(), $txMetaData);
+        $extra = $this->buildRunExtra($database, $timeout, $holder, null, $txMetaData);
         $message = $this->messageFactory->createBeginMessage($extra);
         $response = $message->send()->getResponse();
         $this->assertNoFailure($response);
@@ -249,7 +249,7 @@ public function run(
         array $parameters,
         ?string $database,
         ?float $timeout,
-        BookmarkHolder $holder,
+        ?BookmarkHolder $holder,
         ?AccessMode $mode,
         ?iterable $tsxMetadata,
     ): array {
@@ -295,7 +295,6 @@ public function protocol(): V4_4|V5|V5_1|V5_2|V5_3|V5_4
     public function pull(?int $qid, ?int $fetchSize): array
     {
         $extra = $this->buildResultExtra($fetchSize, $qid);
-        $this->logger?->log(LogLevel::DEBUG, 'PULL', $extra);
 
         $tbr = [];
         $message = $this->messageFactory->createPullMessage($extra);
@@ -331,7 +330,7 @@ public function close(): void
         }
     }
 
-    private function buildRunExtra(?string $database, ?float $timeout, BookmarkHolder $holder, ?AccessMode $mode, ?iterable $metadata): array
+    private function buildRunExtra(?string $database, ?float $timeout, ?BookmarkHolder $holder, ?AccessMode $mode, ?iterable $metadata): array
     {
         $extra = [];
         if ($database !== null) {
@@ -341,7 +340,7 @@ private function buildRunExtra(?string $database, ?float $timeout, BookmarkHolde
             $extra['tx_timeout'] = (int) ($timeout * 1000);
         }
 
-        if (!$holder->getBookmark()->isEmpty()) {
+        if ($holder && !$holder->getBookmark()->isEmpty()) {
             $extra['bookmarks'] = $holder->getBookmark()->values();
         }
 
@@ -366,7 +365,7 @@ private function buildResultExtra(?int $fetchSize, ?int $qid): array
             $extra['n'] = $fetchSize;
         }
 
-        if ($qid !== null) {
+        if ($qid !== null && $qid >= 0) {
             $extra['qid'] = $qid;
         }
 
@@ -420,6 +419,10 @@ public function assertNoFailure(Response $response): void
      */
     public function discardUnconsumedResults(): void
     {
+        if (!in_array($this->protocol()->serverState, [ServerState::STREAMING, ServerState::TX_STREAMING], true)) {
+            return;
+        }
+
         $this->logger?->log(LogLevel::DEBUG, 'Discarding unconsumed results');
 
         $this->subscribedResults = array_values(array_filter(

src/Bolt/BoltUnmanagedTransaction.php

@@ -52,6 +52,7 @@ public function __construct(
         private readonly TransactionConfiguration $tsxConfig,
         private readonly BookmarkHolder $bookmarkHolder,
         private readonly BoltMessageFactory $messageFactory,
+        private readonly bool $isInstantTransaction,
     ) {
     }
 
@@ -147,8 +148,8 @@ public function runStatement(Statement $statement): SummarizedResult
                 $parameters->toArray(),
                 $this->database,
                 $this->tsxConfig->getTimeout(),
-                $this->bookmarkHolder,
-                $this->config->getAccessMode(),
+                $this->isInstantTransaction ? $this->bookmarkHolder : null, // let the begin transaction pass the bookmarks if it is a managed transaction
+                $this->isInstantTransaction ? $this->config->getAccessMode() : null, // let the begin transaction decide if it is a managed transaction
                 $this->tsxConfig->getMetaData()
             );
         } catch (Throwable $e) {

src/Bolt/Session.php

@@ -195,6 +195,7 @@ private function beginInstantTransaction(
             $tsxConfig,
             $this->bookmarkHolder,
             new BoltMessageFactory($connection, $this->getLogger()),
+            true,
         );
     }
 
@@ -246,6 +247,7 @@ private function startTransaction(TransactionConfiguration $config, SessionConfi
             $config,
             $this->bookmarkHolder,
             new BoltMessageFactory($connection, $this->getLogger()),
+            false
         );
     }
 

src/Client.php

@@ -130,7 +130,8 @@ private function startSession(?string $alias, SessionConfiguration $configuratio
 
     public function writeTransaction(callable $tsxHandler, ?string $alias = null, ?TransactionConfiguration $config = null)
     {
-        if ($this->defaultSessionConfiguration->getAccessMode() === AccessMode::WRITE()) {
+        $accessMode = $this->defaultSessionConfiguration->getAccessMode();
+        if ($accessMode === null || $accessMode === AccessMode::WRITE()) {
             $session = $this->getSession($alias);
         } else {
             $sessionConfig = $this->defaultSessionConfiguration->withAccessMode(AccessMode::WRITE());

src/Common/ConnectionConfiguration.php

@@ -27,7 +27,7 @@ public function __construct(
         private string $serverAgent,
         private readonly UriInterface $serverAddress,
         private readonly ConnectionProtocol $protocol,
-        private readonly AccessMode $accessMode,
+        private readonly ?AccessMode $accessMode,
         private readonly ?DatabaseInfo $databaseInfo,
         private readonly string $encryptionLevel,
     ) {
@@ -54,7 +54,7 @@ public function getProtocol(): ConnectionProtocol
         return $this->protocol;
     }
 
-    public function getAccessMode(): AccessMode
+    public function getAccessMode(): ?AccessMode
     {
         return $this->accessMode;
     }

src/Contracts/ConnectionInterface.php

@@ -75,7 +75,7 @@ public function getProtocol(): ConnectionProtocol;
      *
      * @psalm-mutation-free
      */
-    public function getAccessMode(): AccessMode;
+    public function getAccessMode(): ?AccessMode;
 
     /**
      * Returns the information about the database the connection reaches.

src/Databags/SessionConfiguration.php

@@ -117,9 +117,9 @@ public function getFetchSize(): int
      *
      * @psalm-suppress ImpureMethodCall
      */
-    public function getAccessMode(): AccessMode
+    public function getAccessMode(): ?AccessMode
     {
-        return $this->accessMode ?? AccessMode::WRITE();
+        return $this->accessMode;
     }
 
     /**

src/Neo4j/Neo4jConnectionPool.php

@@ -185,9 +185,9 @@ public function getLogger(): ?Neo4jLogger
     /**
      * @throws Exception
      */
-    private function getNextServer(RoutingTable $table, AccessMode $mode): Uri
+    private function getNextServer(RoutingTable $table, ?AccessMode $mode): Uri
     {
-        if (AccessMode::WRITE() === $mode) {
+        if ($mode === null || AccessMode::WRITE() === $mode) {
             $servers = $table->getWithRole(RoutingRoles::LEADER());
         } else {
             $servers = $table->getWithRole(RoutingRoles::FOLLOWER());

testkit-backend/src/Handlers/NewSession.php

@@ -41,8 +41,13 @@ public function handle($request): SessionResponse
     {
         $driver = $this->repository->getDriver($request->driverId);
 
-        $config = SessionConfiguration::default()
-            ->withAccessMode($request->accessMode === 'r' ? AccessMode::READ() : AccessMode::WRITE());
+        $config = SessionConfiguration::default();
+
+        if ($request->accessMode === 'r') {
+            $config = $config->withAccessMode(AccessMode::READ());
+        } elseif ($request->accessMode === 'w') {
+            $config = $config->withAccessMode(AccessMode::WRITE());
+        }
 
         if ($request->bookmarks !== null) {
             $config = $config->withBookmarks([new Bookmark($request->bookmarks)]);
@@ -52,7 +57,9 @@ public function handle($request): SessionResponse
             $config = $config->withDatabase($request->database);
         }
 
-        $config = $config->withFetchSize($request->fetchSize ?? 1);
+        if ($request->fetchSize !== null) {
+            $config = $config->withFetchSize($request->fetchSize);
+        }
 
         $session = $driver->createSession($config);
         $id = Uuid::v4();