made ssl configurator return array instead of working on stream directly

Author: transistive

src/Bolt/BoltConnectionPool.php

@@ -103,7 +103,7 @@ public function canConnect(UriInterface $uri, AuthenticateInterface $authenticat
         $connectingTo = $server ?? $uri;
         $socket = new StreamSocket($uri->getHost(), $connectingTo->getPort() ?? 7687);
 
-        $this->sslConfigurator->configure($uri, $connectingTo, $socket, $table, $this->driverConfig);
+        $this->setupSsl($uri, $connectingTo, $table, $socket);
 
         try {
             $bolt = new Bolt($socket);
@@ -126,7 +126,7 @@ private function openConnection(
     ): BoltConnection {
         $socket = new StreamSocket($connectingTo->getHost(), $connectingTo->getPort() ?? 7687, $socketTimeout);
 
-        $this->sslConfigurator->configure($uri, $connectingTo, $socket, $table, $this->driverConfig);
+        $this->setupSsl($uri, $connectingTo, $table, $socket);
 
         $bolt = new Bolt($socket);
         $authenticate->authenticateBolt($bolt, $connectingTo, $userAgent);
@@ -174,4 +174,12 @@ static function () use ($socket, $authenticate, $connectingTo, $userAgent, $orig
 
         return $connection;
     }
+
+    private function setupSsl(UriInterface $uri, UriInterface $connectingTo, ?RoutingTable $table, StreamSocket $socket): void
+    {
+        $config = $this->sslConfigurator->configure($uri, $connectingTo, $table, $this->driverConfig);
+        if ($config !== null) {
+            $socket->setSslContextOptions($config);
+        }
+    }
 }

src/Bolt/SslConfigurator.php

@@ -11,7 +11,6 @@
 
 namespace Laudis\Neo4j\Bolt;
 
-use Bolt\connection\StreamSocket;
 use function count;
 use function explode;
 use const FILTER_VALIDATE_IP;
@@ -23,7 +22,7 @@
 
 final class SslConfigurator
 {
-    public function configure(UriInterface $uri, UriInterface $server, StreamSocket $socket, ?RoutingTable $table, DriverConfiguration $config): void
+    public function configure(UriInterface $uri, UriInterface $server, ?RoutingTable $table, DriverConfiguration $config): ?array
     {
         $sslMode = $config->getSslConfiguration()->getMode();
         $sslConfig = '';
@@ -43,14 +42,16 @@ public function configure(UriInterface $uri, UriInterface $server, StreamSocket
             // instance aura deployment, we need to pass the original uri for the
             // ssl configuration to be valid.
             if ($table && count($table->getWithRole()) > 1) {
-                $this->enableSsl($server->getHost(), $sslConfig, $socket, $config);
-            } else {
-                $this->enableSsl($uri->getHost(), $sslConfig, $socket, $config);
+                return $this->enableSsl($server->getHost(), $sslConfig, $config);
             }
+
+            return $this->enableSsl($uri->getHost(), $sslConfig, $config);
         }
+
+        return null;
     }
 
-    private function enableSsl(string $host, string $sslConfig, StreamSocket $sock, DriverConfiguration $config): void
+    private function enableSsl(string $host, string $sslConfig, DriverConfiguration $config): ?array
     {
         $options = [
             'verify_peer' => $config->getSslConfiguration()->isVerifyPeer(),
@@ -60,10 +61,15 @@ private function enableSsl(string $host, string $sslConfig, StreamSocket $sock,
             $options['SNI_enabled'] = true;
         }
         if ($sslConfig === 's') {
-            $sock->setSslContextOptions($options);
-        } elseif ($sslConfig === 'ssc') {
+            return $options;
+        }
+
+        if ($sslConfig === 'ssc') {
             $options['allow_self_signed'] = true;
-            $sock->setSslContextOptions($options);
+
+            return $options;
         }
+
+        return null;
     }
 }