fixed typing in http

Author: transistive

src/Contracts/FormatterInterface.php

@@ -16,8 +16,10 @@
 use Bolt\Bolt;
 use Bolt\protocol\V3;
 use JsonException;
+use Laudis\Neo4j\Bolt\BoltConnection;
 use Laudis\Neo4j\Bolt\BoltResult;
 use Laudis\Neo4j\Databags\Statement;
+use Laudis\Neo4j\Http\HttpConnection;
 use Laudis\Neo4j\Types\CypherList;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -73,11 +75,10 @@ interface FormatterInterface
      * Formats the results of the bolt protocol to the unified format.
      *
      * @param BoltMeta                $meta
-     * @param ConnectionInterface<V3> $connection
      *
      * @return ResultFormat
      */
-    public function formatBoltResult(array $meta, BoltResult $result, ConnectionInterface $connection, float $runStart, float $resultAvailableAfter, Statement $statement);
+    public function formatBoltResult(array $meta, BoltResult $result, BoltConnection $connection, float $runStart, float $resultAvailableAfter, Statement $statement);
 
     /**
      * Formats the results of the HTTP protocol to the unified format.
@@ -90,7 +91,7 @@ public function formatBoltResult(array $meta, BoltResult $result, ConnectionInte
      *
      * @psalm-mutation-free
      */
-    public function formatHttpResult(ResponseInterface $response, stdClass $body, ConnectionInterface $connection, float $resultsAvailableAfter, float $resultsConsumedAfter, iterable $statements): CypherList;
+    public function formatHttpResult(ResponseInterface $response, stdClass $body, HttpConnection $connection, float $resultsAvailableAfter, float $resultsConsumedAfter, iterable $statements): CypherList;
 
     /**
      * Decorates a request to make make sure it requests the correct format.

src/Formatter/SummarizedResultFormatter.php

@@ -13,6 +13,8 @@
 
 namespace Laudis\Neo4j\Formatter;
 
+use Laudis\Neo4j\Bolt\BoltConnection;
+use Laudis\Neo4j\Databags\DatabaseInfo;
 use function in_array;
 use function is_int;
 use Laudis\Neo4j\Bolt\BoltResult;
@@ -24,6 +26,7 @@
 use Laudis\Neo4j\Databags\SummarizedResult;
 use Laudis\Neo4j\Databags\SummaryCounters;
 use Laudis\Neo4j\Enum\QueryTypeEnum;
+use Laudis\Neo4j\Http\HttpConnection;
 use Laudis\Neo4j\Types\CypherList;
 use Laudis\Neo4j\Types\CypherMap;
 use function microtime;
@@ -70,7 +73,7 @@ public function __construct(OGMFormatter $formatter)
      *
      * @psalm-mutation-free
      */
-    public function formatHttpStats(stdClass $response, ConnectionInterface $connection, Statement $statement, float $resultAvailableAfter, float $resultConsumedAfter, CypherList $results): SummarizedResult
+    public function formatHttpStats(stdClass $response, HttpConnection $connection, Statement $statement, float $resultAvailableAfter, float $resultConsumedAfter, CypherList $results): SummarizedResult
     {
         if ($response->summary instanceof stdClass) {
             /** @var stdClass $stats */
@@ -161,17 +164,19 @@ public function formatBoltStats(array $response): SummaryCounters
         );
     }
 
-    public function formatBoltResult(array $meta, BoltResult $result, ConnectionInterface $connection, float $runStart, float $resultAvailableAfter, Statement $statement): SummarizedResult
+    public function formatBoltResult(array $meta, BoltResult $result, BoltConnection $connection, float $runStart, float $resultAvailableAfter, Statement $statement): SummarizedResult
     {
         /** @var ResultSummary|null $summary */
         $summary = null;
         $result->setFinishedCallback(function (array $counters) use ($connection, $statement, $runStart, $resultAvailableAfter, &$summary) {
             /** @var BoltCypherStats $counters */
             $stats = $this->formatBoltStats($counters);
             $resultConsumedAfter = $runStart - microtime(true);
+            /** @var string */
+            $db = $counters['db'] ?? '';
             $summary = new ResultSummary(
                 $stats,
-                $connection->getDatabaseInfo(),
+                new DatabaseInfo($db),
                 new CypherList(),
                 null,
                 null,
@@ -202,7 +207,7 @@ public function formatBoltResult(array $meta, BoltResult $result, ConnectionInte
      *
      * @psalm-suppress ImpureMethodCall
      */
-    public function formatHttpResult(ResponseInterface $response, stdClass $body, ConnectionInterface $connection, float $resultsAvailableAfter, float $resultsConsumedAfter, iterable $statements): CypherList
+    public function formatHttpResult(ResponseInterface $response, stdClass $body, HttpConnection $connection, float $resultsAvailableAfter, float $resultsConsumedAfter, iterable $statements): CypherList
     {
         /** @var list<SummarizedResult<CypherMap<OGMTypes>>> */
         $tbr = [];

src/Http/HttpConnection.php

@@ -95,7 +95,7 @@ public function getAccessMode(): AccessMode
      */
     public function getDatabaseInfo(): DatabaseInfo
     {
-        return $this->config->getDatabaseInfo();
+        return $this->config->getDatabaseInfo() ?? new DatabaseInfo('');
     }
 
     /**

src/Http/HttpConnectionPool.php

@@ -13,6 +13,8 @@
 
 namespace Laudis\Neo4j\Http;
 
+use Laudis\Neo4j\Common\ConnectionConfiguration;
+use Laudis\Neo4j\Databags\DriverConfiguration;
 use function json_encode;
 use Laudis\Neo4j\Common\Resolvable;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
@@ -47,25 +49,28 @@ final class HttpConnectionPool implements ConnectionPoolInterface
      * @psalm-readonly
      */
     private Resolvable $streamFactory;
+    /** @psalm-readonly */
+    private DriverConfiguration $config;
 
     /**
      * @param Resolvable<StreamFactoryInterface> $streamFactory
      * @param Resolvable<RequestFactory>         $requestFactory
      * @param Resolvable<ClientInterface>        $client
      * @psalm-mutation-free
      */
-    public function __construct(Resolvable $client, Resolvable $requestFactory, Resolvable $streamFactory)
+    public function __construct(Resolvable $client, Resolvable $requestFactory, Resolvable $streamFactory, DriverConfiguration $config)
     {
         $this->client = $client;
         $this->requestFactory = $requestFactory;
         $this->streamFactory = $streamFactory;
+        $this->config = $config;
     }
 
     public function acquire(
         UriInterface $uri,
         AuthenticateInterface $authenticate,
         SessionConfiguration $config
-    ): ConnectionInterface {
+    ): HttpConnection {
         $request = $this->requestFactory->resolve()->createRequest('POST', $uri);
 
         $path = $request->getUri()->getPath().'/commit';
@@ -95,15 +100,17 @@ public function acquire(
 
         $version = $results[0]['versions'][0] ?? '';
 
-        return new HttpConnection(
-            $this->client->resolve(),
+        $config = new ConnectionConfiguration(
             $results[0]['name'].'-'.$results[0]['edition'].'/'.($version),
             $uri,
             $version,
             ConnectionProtocol::HTTP(),
             $config->getAccessMode(),
-            new DatabaseInfo($config->getDatabase())
+            $this->config,
+            new DatabaseInfo($config->getDatabase() ?? '')
         );
+
+        return new HttpConnection($this->client->resolve(), $config);
     }
 
     public function canConnect(UriInterface $uri, AuthenticateInterface $authenticate, ?string $userAgent = null): bool

src/Http/HttpDriver.php

@@ -158,7 +158,8 @@ private function getHttpConnectionPool(): HttpConnectionPool
         return new HttpConnectionPool(
             Resolvable::once($this->key.':client', fn () => $this->config->getHttpPsrBindings()->getClient()),
             $this->resolvableFactory(),
-            $this->streamFactory()
+            $this->streamFactory(),
+            $this->config
         );
     }
 

src/Http/HttpUnmanagedTransaction.php

@@ -16,15 +16,13 @@
 use function array_intersect;
 use function array_unique;
 use Laudis\Neo4j\Common\TransactionHelper;
-use Laudis\Neo4j\Contracts\ConnectionInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
 use Laudis\Neo4j\Contracts\UnmanagedTransactionInterface;
 use Laudis\Neo4j\Databags\Neo4jError;
 use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Exception\Neo4jException;
 use Laudis\Neo4j\Types\CypherList;
 use function microtime;
-use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamFactoryInterface;
@@ -41,12 +39,8 @@ final class HttpUnmanagedTransaction implements UnmanagedTransactionInterface
     private RequestInterface $request;
     /** @psalm-readonly */
     private StreamFactoryInterface $factory;
-    /**
-     * @psalm-readonly
-     *
-     * @var ConnectionInterface<ClientInterface>
-     */
-    private ConnectionInterface $connection;
+    /** @psalm-readonly */
+    private HttpConnection $connection;
     /**
      * @psalm-readonly
      *
@@ -61,12 +55,11 @@ final class HttpUnmanagedTransaction implements UnmanagedTransactionInterface
     /**
      * @psalm-mutation-free
      *
-     * @param FormatterInterface<T>                $formatter
-     * @param ConnectionInterface<ClientInterface> $connection
+     * @param FormatterInterface<T> $formatter
      */
     public function __construct(
         RequestInterface $request,
-        ConnectionInterface $connection,
+        HttpConnection $connection,
         StreamFactoryInterface $factory,
         FormatterInterface $formatter
     ) {