enforced session config to be provided when verifying connectivity

Author: transistive

src/Basic/Driver.php

@@ -49,9 +49,9 @@ public function createSession(?SessionConfiguration $config = null): Session
         return new Session($this->driver->createSession($config));
     }
 
-    public function verifyConnectivity(): bool
+    public function verifyConnectivity(?SessionConfiguration $config = null): bool
     {
-        return $this->driver->verifyConnectivity();
+        return $this->driver->verifyConnectivity($config);
     }
 
     /**

src/Bolt/BoltDriver.php

@@ -105,10 +105,11 @@ public function createSession(?SessionConfiguration $config = null): SessionInte
         return new Session($sessionConfig, $this->pool, $this->formatter);
     }
 
-    public function verifyConnectivity(): bool
+    public function verifyConnectivity(?SessionConfiguration $config = null): bool
     {
+        $config ??= SessionConfiguration::default();
         try {
-            GeneratorHelper::getReturnFromGenerator($this->pool->acquire(SessionConfiguration::default()));
+            GeneratorHelper::getReturnFromGenerator($this->pool->acquire($config));
         } catch (Throwable $e) {
             return false;
         }

src/Client.php

@@ -80,7 +80,7 @@ public function beginTransaction(?iterable $statements = null, ?string $alias =
 
     public function getDriver(?string $alias): DriverInterface
     {
-        return $this->driverSetups->getDriver($alias);
+        return $this->driverSetups->getDriver($this->defaultSessionConfiguration, $alias);
     }
 
     /**
@@ -114,7 +114,7 @@ public function transaction(callable $tsxHandler, ?string $alias = null, ?Transa
 
     public function verifyConnectivity(?string $driver = null): bool
     {
-        return $this->driverSetups->verifyConnectivity($driver);
+        return $this->driverSetups->verifyConnectivity($this->defaultSessionConfiguration, $driver);
     }
 
     private function getTsxConfig(?TransactionConfiguration $config): TransactionConfiguration

src/Common/DriverSetupManager.php

@@ -11,6 +11,7 @@
 
 namespace Laudis\Neo4j\Common;
 
+use Laudis\Neo4j\Databags\SessionConfiguration;
 use function array_key_exists;
 use function array_key_first;
 use function array_reduce;
@@ -76,7 +77,7 @@ public function withSetup(DriverSetup $setup, ?string $alias = null, ?int $prior
     /**
      * @return DriverInterface<ResultFormat>
      */
-    public function getDriver(?string $alias = null): DriverInterface
+    public function getDriver(SessionConfiguration $config, ?string $alias = null): DriverInterface
     {
         $alias ??= $this->decideAlias($alias);
 
@@ -90,7 +91,7 @@ public function getDriver(?string $alias = null): DriverInterface
             $setup = new DriverSetup(Uri::create(self::DEFAULT_DRIVER_CONFIG), Authenticate::disabled());
             $this->driverSetups['default']->insert($setup, PHP_INT_MIN);
 
-            return $this->getDriver();
+            return $this->getDriver($config);
         }
 
         if (array_key_exists($alias, $this->drivers)) {
@@ -104,7 +105,7 @@ public function getDriver(?string $alias = null): DriverInterface
 
             $driver = DriverFactory::create($uri, $this->configuration, $auth, $this->formatter);
             $urisTried[] = $uri->__toString();
-            if ($driver->verifyConnectivity()) {
+            if ($driver->verifyConnectivity($config)) {
                 $this->drivers[$alias] = $driver;
 
                 return $driver;
@@ -114,10 +115,10 @@ public function getDriver(?string $alias = null): DriverInterface
         throw new RuntimeException(sprintf('Cannot connect to any server on alias: %s with Uris: (\'%s\')', $alias, implode('\', ', array_unique($urisTried))));
     }
 
-    public function verifyConnectivity(?string $alias = null): bool
+    public function verifyConnectivity(SessionConfiguration $config, ?string $alias = null): bool
     {
         try {
-            $this->getDriver($alias);
+            $this->getDriver($config, $alias);
         } catch (RuntimeException $e) {
             return false;
         }

src/Contracts/DriverInterface.php

@@ -38,5 +38,5 @@ public function createSession(?SessionConfiguration $config = null): SessionInte
     /**
      * Returns true if the driver can make a valid connection with the server.
      */
-    public function verifyConnectivity(): bool;
+    public function verifyConnectivity(?SessionConfiguration $config = null): bool;
 }

src/Http/HttpDriver.php

@@ -127,7 +127,8 @@ public function createSession(?SessionConfiguration $config = null): SessionInte
 
     public function verifyConnectivity(?SessionConfiguration $config = null): bool
     {
-        return $this->getHttpConnectionPool($this->tsxUrl($config ?? SessionConfiguration::default()))
+        $config ??= SessionConfiguration::default();
+        return $this->getHttpConnectionPool($this->tsxUrl($config))
                     ->canConnect($this->uri, $this->auth);
     }
 

src/Neo4j/Neo4jDriver.php

@@ -107,10 +107,11 @@ public function createSession(?SessionConfiguration $config = null): SessionInte
         return new Session($config, $this->pool, $this->formatter);
     }
 
-    public function verifyConnectivity(): bool
+    public function verifyConnectivity(?SessionConfiguration $config = null): bool
     {
+        $config ??= SessionConfiguration::default();
         try {
-            GeneratorHelper::getReturnFromGenerator($this->pool->acquire(SessionConfiguration::default()));
+            GeneratorHelper::getReturnFromGenerator($this->pool->acquire($config));
         } catch (Throwable $e) {
             return false;
         }