fixed psalm typing warnings

Author: transistive

src/Bolt/BoltConnectionPool.php

@@ -51,7 +51,7 @@ public function acquire(
         ?UriInterface $server = null
     ): ConnectionInterface {
         $connectingTo = $server ?? $uri;
-        $key = $connectingTo->getHost().':'.$connectingTo->getPort();
+        $key = $connectingTo->getHost().':'.($connectingTo->getPort() ?? '7687');
         if (!isset($this->connectionCache[$key])) {
             self::$connectionCache[$key] = [];
         }

src/Bolt/BoltUnmanagedTransaction.php

@@ -37,6 +37,7 @@
  */
 final class BoltUnmanagedTransaction implements UnmanagedTransactionInterface
 {
+    /** @var FormatterInterface<T> */
     private FormatterInterface $formatter;
     /** @var ConnectionInterface<Bolt> */
     private ConnectionInterface $connection;

src/Common/BoltConnection.php

@@ -57,7 +57,7 @@ public function __construct(
         $this->socket = $socket;
     }
 
-    public function getImplementation()
+    public function getImplementation(): Bolt
     {
         return $this->bolt;
     }

src/Http/HttpConnection.php

@@ -20,6 +20,9 @@
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\UriInterface;
 
+/**
+ * @implements ConnectionInterface<ClientInterface>
+ */
 final class HttpConnection implements ConnectionInterface
 {
     private string $serverAgent;

src/Neo4j/Neo4jConnectionPool.php

@@ -24,7 +24,6 @@
 use Laudis\Neo4j\Enum\AccessMode;
 use Laudis\Neo4j\Enum\ConnectionProtocol;
 use Laudis\Neo4j\Enum\RoutingRoles;
-use Laudis\Neo4j\Types\CypherList;
 use Psr\Http\Message\UriInterface;
 use function random_int;
 use function str_starts_with;
@@ -86,33 +85,40 @@ private function getNextServer(RoutingTable $table, AccessMode $mode): Uri
     private function routingTable(ConnectionInterface $connection): RoutingTable
     {
         if ($this->table === null || $this->table->getTtl() < time()) {
+            /** @var Bolt */
             $bolt = $connection->getImplementation();
             $protocol = $connection->getProtocol();
             if ($protocol->compare(ConnectionProtocol::BOLT_V43()) >= 0) {
-                $route = $bolt->route()['rt'];
-                ['servers' => $servers, 'ttl' => $ttl ] = $route;
+                /** @var array{rt: array{servers: list<array{addresses: list<string>, role:string}>, ttl: int}} $route */
+                $route = $bolt->route();
+                ['servers' => $servers, 'ttl' => $ttl ] = $route['rt'];
             } elseif ($protocol->compare(ConnectionProtocol::BOLT_V40()) >= 0) {
                 $bolt->run('CALL dbms.routing.getRoutingTable({context: []})');
+                /**
+                 * @var iterable<array{addresses: list<string>, role:string}> $servers
+                 * @var int                       $ttl
+                 */
                 ['servers' => $servers, 'ttl' => $ttl] = $bolt->pullAll();
             } else {
                 $bolt->run('CALL dbms.cluster.overview()');
+                /** @var list<array{addresses: list<string>, role: string}> */
                 $response = $bolt->pullAll();
 
                 /** @var iterable<array{addresses: list<string>, role:string}> $servers */
                 $servers = [];
                 $ttl = time() + 3600;
                 foreach ($response as $server) {
-                    /** @var CypherList<string> $addresses */
-                    $addresses = $server->get('addresses');
-                    $addresses = $addresses->filter(static fn (string $x) => str_starts_with($x, 'bolt://'));
+                    $addresses = $server['addresses'];
+                    $addresses = array_filter($addresses, static fn (string $x) => str_starts_with($x, 'bolt://'));
                     /**
                      * @psalm-suppress InvalidArrayAssignment
                      *
                      * @var array{addresses: list<string>, role:string}
                      */
-                    $servers[] = ['addresses' => $addresses->toArray(), 'role' => $server->get('role')];
+                    $servers[] = ['addresses' => $addresses, 'role' => $server['role']];
                 }
             }
+
             $this->table = new RoutingTable($servers, $ttl);
         }
 

src/ParameterHelper.php

@@ -47,7 +47,11 @@ public static function asList(iterable $iterable): CypherList
      */
     public static function asMap(iterable $iterable): CypherMap
     {
-        return new CypherMap($iterable);
+        $tbr = [];
+        foreach ($iterable as $key => $value) {
+            $tbr[(string) $key] = $value;
+        }
+        return new CypherMap($tbr);
     }
 
     /**