correctly propagate tx_timeout

Author: transistive

src/Bolt/Session.php

@@ -160,7 +160,9 @@ private function beginInstantTransaction(
     private function acquireConnection(TransactionConfiguration $config, SessionConfiguration $sessionConfig): BoltConnection
     {
         $connection = $this->pool->acquire($this->uri, $this->auth, $sessionConfig);
-        $connection->setTimeout($config->getTimeout());
+        // We try and let the server do the timeout management.
+        // Since the client should not run indefinitely, we just multiply the client side by two, just in case
+        $connection->setTimeout($config->getTimeout() * 2);
 
         return $connection;
     }

tests/Integration/ComplexQueryTest.php

@@ -376,6 +376,52 @@ public function testLongQueryUnmanaged(string $alias): void
         $tsx->run('CALL apoc.util.sleep(10000)');
     }
 
+    /**
+     * @dataProvider connectionAliases
+     */
+    public function testSimpleTimeout(string $alias): void
+    {
+        if (str_starts_with($alias, 'http')) {
+            self::markTestSkipped('Http does not support timeouts at the moment');
+        }
+
+        try {
+            $this->getClient()
+                ->getDriver($alias)
+                ->createSession()
+                ->run(
+                    "MATCH (n:Node) SET n.testing = 'hello' WITH * CALL apoc.util.sleep(2000000)",
+                    [],
+                    TransactionConfiguration::default()->withTimeout(10)
+                );
+        } catch (Neo4jException $e) {
+            self::assertEquals('Neo.ClientError.Transaction.TransactionTimedOut', $e->getNeo4jCode());
+        }
+    }
+
+    /**
+     * @dataProvider connectionAliases
+     */
+    public function testDiscardAfterTimeout(string $alias): void
+    {
+        if (str_starts_with($alias, 'http')) {
+            self::markTestSkipped('Http does not support timeouts at the moment');
+        }
+
+        $this->expectException(Neo4jException::class);
+
+        $result = $this->getClient()
+            ->getDriver($alias)
+            ->createSession()
+            ->run(
+                "MATCH (n:Node) SET n.testing = 'hello' WITH * CALL apoc.util.sleep(2000000)",
+                [],
+                TransactionConfiguration::default()->withTimeout(150)
+            );
+
+        unset($result);
+    }
+
     /**
      * @dataProvider connectionAliases
      */