generified Result

Author: transistive

src/Bolt/BoltDriver.php

@@ -13,7 +13,7 @@
 
 namespace Laudis\Neo4j\Bolt;
 
-use Bolt\connection\StreamSocket;
+use Bolt\Bolt;
 use Exception;
 use function is_string;
 use Laudis\Neo4j\Authentication\Authenticate;
@@ -40,15 +40,15 @@ final class BoltDriver implements DriverInterface
 {
     private UriInterface $parsedUrl;
     private AuthenticateInterface $auth;
-    /** @var ConnectionPoolInterface<StreamSocket> */
+    /** @var ConnectionPoolInterface<Bolt> */
     private ConnectionPoolInterface $pool;
     private DriverConfiguration $config;
     private FormatterInterface $formatter;
     private float $socketTimeout;
 
     /**
-     * @param FormatterInterface<T>                 $formatter
-     * @param ConnectionPoolInterface<StreamSocket> $pool
+     * @param FormatterInterface<T>         $formatter
+     * @param ConnectionPoolInterface<Bolt> $pool
      */
     public function __construct(
         UriInterface $parsedUrl,

src/Common/TransactionHelper.php

@@ -96,7 +96,10 @@ public static function connectionFromSocket(
         $bolt = new Bolt($socket);
         $authenticate->authenticateBolt($bolt, $uri, $userAgent);
 
-        /** @var array{'name': 0, 'version': 1, 'edition': 2} $fields */
+        /**
+         * @var array{'name': 0, 'version': 1, 'edition': 2}
+         * @psalm-suppress PossiblyUndefinedStringArrayOffset
+         */
         $fields = array_flip($bolt->run(<<<'CYPHER'
 CALL dbms.components()
 YIELD name, versions, edition

src/Databags/Result.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Laudis Neo4j package.
+ *
+ * (c) Laudis technologies <http://laudis.tech>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Laudis\Neo4j\Databags;
+
+use Laudis\Neo4j\Types\CypherList;
+
+/**
+ * @template T
+ */
+final class Result
+{
+    private ResultSummary $summary;
+    /** @var T */
+    private $result;
+
+    /**
+     * @param T                  $result
+     * @param CypherList<string> $keys
+     */
+    public function __construct($result, ResultSummary $summary)
+    {
+        $this->summary = $summary;
+        $this->result = $result;
+    }
+
+    /**
+     * @return T
+     */
+    public function getResult()
+    {
+        return $this->result;
+    }
+
+    public function getSummary(): ResultSummary
+    {
+        return $this->summary;
+    }
+}

src/Formatter/ResultFormatter.php

@@ -18,36 +18,39 @@
 use function is_int;
 use Laudis\Neo4j\Contracts\ConnectionInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
+use Laudis\Neo4j\Databags\Result;
 use Laudis\Neo4j\Databags\ResultSummary;
 use Laudis\Neo4j\Databags\ServerInfo;
 use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Databags\SummaryCounters;
 use Laudis\Neo4j\Enum\QueryTypeEnum;
-use Laudis\Neo4j\Result;
 use Laudis\Neo4j\Types\CypherList;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use UnexpectedValueException;
 
 /**
+ * @template T
+ *
  * @psalm-import-type CypherResponseSet from \Laudis\Neo4j\Contracts\FormatterInterface
  * @psalm-import-type CypherResponse from \Laudis\Neo4j\Contracts\FormatterInterface
  * @psalm-import-type BoltCypherStats from \Laudis\Neo4j\Contracts\FormatterInterface
  *
- * @implements FormatterInterface<Result>
+ * @implements FormatterInterface<Result<T>>
  */
 final class ResultFormatter implements FormatterInterface
 {
+    /** @var FormatterInterface<T> */
     private FormatterInterface $formatter;
 
+    /**
+     * @param FormatterInterface<T> $formatter
+     */
     public function __construct(FormatterInterface $formatter)
     {
         $this->formatter = $formatter;
     }
 
-    /**
-     * @param CypherResponse $response
-     */
     public function formatHttpStats(array $response, ConnectionInterface $connection, Statement $statement, float $resultAvailableAfter, float $resultConsumedAfter, CypherList $results): Result
     {
         if (!isset($response['stats'])) {
@@ -88,11 +91,7 @@ public function formatHttpStats(array $response, ConnectionInterface $connection
             )
         );
 
-        return new Result(
-            new CypherList(new Vector($response['columns'])),
-            $summary,
-            $results
-        );
+        return new Result($results, $summary);
     }
 
     /**
@@ -141,28 +140,25 @@ public function formatBoltResult(array $meta, array $results, ConnectionInterfac
         $response = $results[$last];
 
         $counters = $this->formatBoltStats($response);
-        $columns = $meta['fields'];
-
-        return new Result(
-            new CypherList(new Vector($columns)),
-            new ResultSummary(
-                $counters,
-                $connection->getDatabaseInfo(),
-                new CypherList(new Vector()),
-                null,
-                null,
-                $statement,
-                QueryTypeEnum::fromCounters($counters),
-                $resultAvailableAfter,
-                $resultConsumedAfter,
-                new ServerInfo(
-                    $connection->getServerAddress(),
-                    $connection->getProtocol(),
-                    $connection->getServerAgent()
-                )
-            ),
-            $this->formatter->formatBoltResult($meta, $results, $connection, $resultAvailableAfter, $resultConsumedAfter, $statement)
+        $summary = new ResultSummary(
+            $counters,
+            $connection->getDatabaseInfo(),
+            new CypherList(new Vector()),
+            null,
+            null,
+            $statement,
+            QueryTypeEnum::fromCounters($counters),
+            $resultAvailableAfter,
+            $resultConsumedAfter,
+            new ServerInfo(
+                $connection->getServerAddress(),
+                $connection->getProtocol(),
+                $connection->getServerAgent()
+            )
         );
+        $formattedResult = $this->formatter->formatBoltResult($meta, $results, $connection, $resultAvailableAfter, $resultConsumedAfter, $statement);
+
+        return new Result($formattedResult, $summary);
     }
 
     public function formatHttpResult(ResponseInterface $response, array $body, ConnectionInterface $connection, float $resultsAvailableAfter, float $resultsConsumedAfter, iterable $statements): CypherList

src/Http/HttpUnmanagedTransaction.php

@@ -23,6 +23,7 @@
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
+use function microtime;
 
 /**
  * @template T
@@ -80,10 +81,12 @@ public function runStatements(iterable $statements): CypherList
         $body = HttpHelper::statementsToString($this->formatter, $statements);
 
         $request = $request->withBody($this->factory->createStream($body));
+        $start = microtime(true);
         $response = $this->connection->getImplementation()->sendRequest($request);
+        $total = microtime(true) - $start;
         $data = HttpHelper::interpretResponse($response);
 
-        return $this->formatter->formatHttpResult($response, $data, $this->connection);
+        return $this->formatter->formatHttpResult($response, $data, $this->connection, $total, $total, $statements);
     }
 
     /**
@@ -96,11 +99,13 @@ public function commit(iterable $statements = []): CypherList
         $content = HttpHelper::statementsToString($this->formatter, $statements);
         $request = $request->withBody($this->factory->createStream($content));
 
+        $start = microtime(true);
         $response = $this->connection->getImplementation()->sendRequest($request);
+        $total = microtime(true) - $start;
 
         $data = HttpHelper::interpretResponse($response);
 
-        return $this->formatter->formatHttpResult($response, $data, $this->connection);
+        return $this->formatter->formatHttpResult($response, $data, $this->connection, $total, $total, $statements);
     }
 
     /**

src/Neo4j/Neo4jDriver.php

@@ -13,11 +13,10 @@
 
 namespace Laudis\Neo4j\Neo4j;
 
-use Bolt\connection\StreamSocket;
+use Bolt\Bolt;
 use Exception;
 use function is_string;
 use Laudis\Neo4j\Authentication\Authenticate;
-use Laudis\Neo4j\Bolt\BoltConnectionPool;
 use Laudis\Neo4j\Bolt\Session;
 use Laudis\Neo4j\Common\Uri;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
@@ -42,15 +41,15 @@ final class Neo4jDriver implements DriverInterface
 {
     private UriInterface $parsedUrl;
     private AuthenticateInterface $auth;
-    /** @var ConnectionPoolInterface<StreamSocket> */
+    /** @var ConnectionPoolInterface<Bolt> */
     private ConnectionPoolInterface $pool;
     private DriverConfiguration $config;
     private FormatterInterface $formatter;
     private float $socketTimeout;
 
     /**
-     * @param FormatterInterface<T>                 $formatter
-     * @param ConnectionPoolInterface<StreamSocket> $pool
+     * @param FormatterInterface<T>         $formatter
+     * @param ConnectionPoolInterface<Bolt> $pool
      */
     public function __construct(
         UriInterface $parsedUrl,
@@ -93,7 +92,7 @@ public static function create($uri, ?DriverConfiguration $configuration = null,
             return new self(
                 $uri,
                 $authenticate ?? Authenticate::fromUrl(),
-                new Neo4jConnectionPool(new BoltConnectionPool()),
+                new Neo4jConnectionPool(),
                 $configuration ?? DriverConfiguration::default(),
                 $formatter,
                 $socketTimeout
@@ -103,7 +102,7 @@ public static function create($uri, ?DriverConfiguration $configuration = null,
         return new self(
             $uri,
             $authenticate ?? Authenticate::fromUrl(),
-            new Neo4jConnectionPool(new BoltConnectionPool()),
+            new Neo4jConnectionPool(),
             $configuration ?? DriverConfiguration::default(),
             OGMFormatter::create(),
             $socketTimeout

src/Result.php

@@ -29,11 +29,11 @@ final class CypherList implements CypherContainerInterface
     private Vector $vector;
 
     /**
-     * @param Vector<T> $vector
+     * @param iterable<T> $vector
      */
-    public function __construct(Vector $vector)
+    public function __construct(iterable $vector)
     {
-        $this->vector = $vector;
+        $this->vector = new Vector($vector);
     }
 
     public function count(): int