Skip to content

Commit 736b483

Browse files
committed
fixed bad timeout format
1 parent 6026c2f commit 736b483

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

src/Bolt/BoltConnection.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ public function close(): void
156156
$this->protocol()->goodbye();
157157

158158
$this->serverState = 'DEFUNCT';
159-
$this->subscribedResults = [];
160159
}
161160

162161
private function consumeResults(): void
@@ -386,7 +385,7 @@ private function buildRunExtra(?string $database, ?float $timeout): array
386385
$extra['db'] = $database;
387386
}
388387
if ($timeout) {
389-
$extra['tx_timeout'] = $timeout * 1000;
388+
$extra['tx_timeout'] = (int) ($timeout * 1000);
390389
}
391390

392391
return $extra;
@@ -411,7 +410,7 @@ public function getServerState(): string
411410
return $this->serverState;
412411
}
413412

414-
private function subscribeResult(SummarizedResult $result): void
413+
public function subscribeResult(SummarizedResult $result): void
415414
{
416415
$this->subscribedResults[] = WeakReference::create($result);
417416
}

src/Formatter/SummarizedResultFormatter.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,13 @@ public function formatBoltResult(array $meta, BoltResult $result, BoltConnection
197197
/**
198198
* @psalm-suppress MixedArgument
199199
*
200-
* @var SummarizedResult<CypherMap<OGMTypes>>
200+
* @var SummarizedResult<CypherMap<OGMTypes>> $result
201201
*/
202-
return (new SummarizedResult($summary, $formattedResult))->withCacheLimit($result->getFetchSize());
202+
$result = (new SummarizedResult($summary, $formattedResult))->withCacheLimit($result->getFetchSize());
203+
204+
$connection->subscribeResult($result);
205+
206+
return $result;
203207
}
204208

205209
/**

tests/Integration/BasicDriverTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
/*
45
* This file is part of the Laudis Neo4j package.
@@ -57,7 +58,7 @@ public function testFullWalk(string $connection): void
5758

5859
$session = $driver->createSession();
5960

60-
$x = $session->run('MATCH (x) DETACH DELETE x');
61+
$session->run('MATCH (x) DETACH DELETE x');
6162
$session->run('CREATE (x:X {id: 0})');
6263

6364
$id = 1;

tests/Integration/BoltResultIntegrationTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Bolt\Bolt;
1515
use Bolt\connection\StreamSocket;
1616
use Dotenv\Dotenv;
17+
use Laudis\Neo4j\Common\ConnectionConfiguration;
1718
use function explode;
1819
use function is_string;
1920
use Laudis\Neo4j\Authentication\Authenticate;
@@ -62,17 +63,16 @@ public function testIterationLong(string $connection): void
6263

6364
$i = 0;
6465
$factory = new BoltFactory(new Bolt($socket), Authenticate::fromUrl($uri), '', $socket);
65-
$connection = new BoltConnection(
66+
$config = new ConnectionConfiguration(
6667
'',
6768
$uri,
6869
'',
6970
ConnectionProtocol::determineBoltVersion($factory->build()[0]),
7071
AccessMode::READ(),
71-
new DatabaseInfo(''),
72-
$factory,
73-
null,
74-
DriverConfiguration::default()
72+
DriverConfiguration::default(),
73+
null
7574
);
75+
$connection = new BoltConnection($factory, null, $config);
7676
$connection->open();
7777
$connection->getImplementation()->run('UNWIND range(1, 100000) AS i RETURN i');
7878
$result = new BoltResult($connection, 1000, -1);

0 commit comments

Comments
 (0)