exposed version to neo4j connection pool and routed the correct calls

Author: transistive

src/Neo4j/Neo4jConnectionPool.php

@@ -23,6 +23,7 @@
 use Laudis\Neo4j\Enum\RoutingRoles;
 use Psr\Http\Message\UriInterface;
 use function random_int;
+use function str_starts_with;
 use function time;
 
 /**
@@ -35,13 +36,15 @@ final class Neo4jConnectionPool implements ConnectionPoolInterface
     private ?RoutingTable $table = null;
     /** @var ConnectionPoolInterface<StreamSocket> */
     private ConnectionPoolInterface $pool;
+    private string $version;
 
     /**
      * @param ConnectionPoolInterface<StreamSocket> $pool
      */
-    public function __construct(ConnectionPoolInterface $pool)
+    public function __construct(ConnectionPoolInterface $pool, string $version)
     {
         $this->pool = $pool;
+        $this->version = $version;
     }
 
     /**
@@ -78,7 +81,12 @@ private function getNextServer(RoutingTable $table, AccessMode $mode): string
     private function routingTable(DriverInterface $driver): RoutingTable
     {
         if ($this->table === null || $this->table->getTtl() < time()) {
-            $response = $driver->createSession()->run('CALL dbms.routing.getRoutingTable({context: []})')->first();
+            $session = $driver->createSession();
+            if (str_starts_with($this->version, '3')) {
+                $response = $session->run('CALL dbms.cluster.overview()')->first();
+            } else {
+                $response = $session->run('CALL dbms.routing.getRoutingTable({context: []})')->first();
+            }
             /** @var iterable<array{addresses: list<string>, role:string}> $values */
             $values = $response->get('servers');
             /** @var int $ttl */

src/Neo4j/Neo4jDriver.php

@@ -15,6 +15,8 @@
 
 use Bolt\connection\StreamSocket;
 use Exception;
+use Laudis\Neo4j\Bolt\BoltDriver;
+use RuntimeException;
 use function is_string;
 use Laudis\Neo4j\Authentication\Authenticate;
 use Laudis\Neo4j\Bolt\BoltConnectionPool;
@@ -73,17 +75,25 @@ public static function create($uri, ?DriverConfiguration $configuration = null,
 
     /**
      * @param string|UriInterface $uri
+     * @throws Exception
      */
     public static function createWithFormatter($uri, FormatterInterface $formatter, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null): self
     {
         if (is_string($uri)) {
             $uri = Uri::create($uri);
         }
 
+        $session = BoltDriver::create($uri)->createSession();
+        $row = $session->run(
+            'CALL dbms.components() yield versions UNWIND versions as version RETURN version'
+        )->first();
+        $version = $row->get('version');
+
+        /** @psalm-suppress all */
         return new self(
             $uri,
             $authenticate ?? Authenticate::fromUrl(),
-            new Neo4jConnectionPool(new BoltConnectionPool()),
+            new Neo4jConnectionPool(new BoltConnectionPool(), $version),
             $configuration ?? DriverConfiguration::default(),
             $formatter
         );

tests/Integration/HttpConsistencyTest.php

@@ -28,10 +28,12 @@ protected function setUp(): void
         $this->client = ClientBuilder::create()
             ->withDriver('http', 'http://neo4j:test@neo4j')
             ->withDriver('bolt', 'bolt://neo4j:test@neo4j')
-            ->withDriver('neo4j', 'neo4j://neo4j:test@neo4j')
+            ->withDriver('neo4j', 'neo4j://neo4j:test@core1')
             ->build();
 
-        $this->client->run('MATCH (x) DETACH DELETE x');
+        $this->client->run('MATCH (x) DETACH DELETE x', [], 'http');
+        $this->client->run('MATCH (x) DETACH DELETE x', [], 'bolt');
+        $this->client->run('MATCH (x) DETACH DELETE x', [], 'neo4j');
     }
 
     /**