subscribed other formatter results as well to connections

Author: transistive

src/Bolt/BoltConnection.php

@@ -18,6 +18,7 @@
 use Bolt\error\MessageException;
 use Bolt\protocol\V3;
 use Bolt\protocol\V4;
+use Laudis\Neo4j\Types\CypherList;
 use function count;
 use Laudis\Neo4j\BoltFactory;
 use Laudis\Neo4j\Common\ConnectionConfiguration;
@@ -48,7 +49,7 @@ final class BoltConnection implements ConnectionInterface
 
     private int $ownerCount = 0;
     private string $serverState = 'DISCONNECTED';
-    /** @var list<WeakReference<SummarizedResult>> */
+    /** @var list<WeakReference<CypherList>> */
     private array $subscribedResults = [];
 
     /**
@@ -411,7 +412,7 @@ public function getServerState(): string
         return $this->serverState;
     }
 
-    public function subscribeResult(SummarizedResult $result): void
+    public function subscribeResult(CypherList $result): void
     {
         $this->subscribedResults[] = WeakReference::create($result);
     }

src/Formatter/BasicFormatter.php

@@ -18,6 +18,7 @@
 use function gettype;
 use function is_array;
 use function is_object;
+use Laudis\Neo4j\Bolt\BoltConnection;
 use Laudis\Neo4j\Bolt\BoltResult;
 use Laudis\Neo4j\Contracts\ConnectionInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
@@ -54,13 +55,17 @@ public static function create(): self
      *
      * @return CypherList<CypherMap<array|scalar|null>>
      */
-    public function formatBoltResult(array $meta, BoltResult $result, ?ConnectionInterface $connection = null, ?float $runStart = null, ?float $resultAvailableAfter = null, ?Statement $statement = null): CypherList
+    public function formatBoltResult(array $meta, BoltResult $result, ?BoltConnection $connection = null, ?float $runStart = null, ?float $resultAvailableAfter = null, ?Statement $statement = null): CypherList
     {
-        return (new CypherList(function () use ($meta, $result) {
+        $result = (new CypherList(function () use ($meta, $result) {
             foreach ($result as $row) {
                 yield $this->formatRow($meta, $row);
             }
         }))->withCacheLimit($result->getFetchSize());
+
+        $connection->subscribeResult($result);
+
+        return $result;
     }
 
     /**

src/Formatter/OGMFormatter.php

@@ -13,6 +13,7 @@
 
 namespace Laudis\Neo4j\Formatter;
 
+use Laudis\Neo4j\Bolt\BoltConnection;
 use Laudis\Neo4j\Bolt\BoltResult;
 use Laudis\Neo4j\Contracts\ConnectionInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
@@ -71,13 +72,17 @@ public static function create(): OGMFormatter
      *
      * @return CypherList<CypherMap<OGMTypes>>
      */
-    public function formatBoltResult(array $meta, BoltResult $result, ConnectionInterface $connection, float $runStart, float $resultAvailableAfter, Statement $statement): CypherList
+    public function formatBoltResult(array $meta, BoltResult $result, BoltConnection $connection, float $runStart, float $resultAvailableAfter, Statement $statement): CypherList
     {
-        return (new CypherList(function () use ($result, $meta) {
+        $tbr = (new CypherList(function () use ($result, $meta) {
             foreach ($result as $row) {
                 yield $this->formatRow($meta, $row);
             }
         }))->withCacheLimit($result->getFetchSize());
+
+        $connection->subscribeResult($tbr);
+
+        return $tbr;
     }
 
     /**