Skip to content

feat: Add support for Bolt 5.2 and 5.1 #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 23, 2024
Merged

feat: Add support for Bolt 5.2 and 5.1 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e2b615
feat: Add support for Bolt 5.2 and 5.1
exaby73 Jul 23, 2024
7c8b690
feat: Check for 5.2 and 5.1 on generic ConnectException
exaby73 Jul 23, 2024
97744d7
feat: Update BoltConnection to accept new added versions
exaby73 Jul 23, 2024
a1b8aef
feat: Update BoltConnection types
exaby73 Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Bolt/BoltConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
use Bolt\protocol\Response;
use Bolt\protocol\V4_4;
use Bolt\protocol\V5;
use Bolt\protocol\V5_1;
use Bolt\protocol\V5_2;
use Bolt\protocol\V5_3;
use Bolt\protocol\V5_4;
use Laudis\Neo4j\Common\ConnectionConfiguration;
Expand All @@ -35,7 +37,7 @@
use WeakReference;

/**
* @implements ConnectionInterface<array{0: V4_4|V5|V5_3|V5_4, 1: Connection}>
* @implements ConnectionInterface<array{0: V4_4|V5|V5_1|V5_2|V5_3|V5_4, 1: Connection}>
*
* @psalm-import-type BoltMeta from FormatterInterface
*/
Expand All @@ -57,7 +59,7 @@ class BoltConnection implements ConnectionInterface
private array $subscribedResults = [];

/**
* @return array{0: V4_4|V5|V5_3|V5_4, 1: Connection}
* @return array{0: V4_4|V5|V5_1|V5_2|V5_3|V5_4, 1: Connection}
*/
public function getImplementation(): array
{
Expand All @@ -68,7 +70,7 @@ public function getImplementation(): array
* @psalm-mutation-free
*/
public function __construct(
private V4_4|V5|V5_3|V5_4 $boltProtocol,
private V4_4|V5|V5_1|V5_2|V5_3|V5_4 $boltProtocol,
private readonly Connection $connection,
private readonly AuthenticateInterface $auth,
private readonly string $userAgent,
Expand Down Expand Up @@ -268,7 +270,7 @@ public function rollback(): void
$this->assertNoFailure($response);
}

public function protocol(): V4_4|V5|V5_3|V5_4
public function protocol(): V4_4|V5|V5_1|V5_2|V5_3|V5_4
{
return $this->boltProtocol;
}
Expand Down
15 changes: 12 additions & 3 deletions src/Bolt/ProtocolFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@

use Bolt\Bolt;
use Bolt\connection\IConnection;
use Bolt\error\ConnectException;
use Bolt\protocol\V4_4;
use Bolt\protocol\V5;
use Bolt\protocol\V5_1;
use Bolt\protocol\V5_2;
use Bolt\protocol\V5_3;
use Bolt\protocol\V5_4;
use Laudis\Neo4j\Contracts\AuthenticateInterface;
Expand All @@ -25,16 +28,22 @@
class ProtocolFactory
{
/**
* @return array{0: V4_4|V5|V5_3|V5_4, 1: array{server: string, connection_id: string, hints: list}}
* @return array{0: V4_4|V5|V5_1|V5_2|V5_3|V5_4, 1: array{server: string, connection_id: string, hints: list}}
*/
public function createProtocol(IConnection $connection, AuthenticateInterface $auth, string $userAgent): array
{
$bolt = new Bolt($connection);
$bolt->setProtocolVersions(5.4, 5.3, 5, 4.4);

$protocol = $bolt->build();
try {
$protocol = $bolt->build();
} catch (ConnectException $e) {
// Assume incorrect protocol version
$bolt->setProtocolVersions(5.2, 5.1);
$protocol = $bolt->build();
}

if (!($protocol instanceof V4_4 || $protocol instanceof V5 || $protocol instanceof V5_3 || $protocol instanceof V5_4)) {
if (!($protocol instanceof V4_4 || $protocol instanceof V5 || $protocol instanceof V5_1 || $protocol instanceof V5_2 || $protocol instanceof V5_3 || $protocol instanceof V5_4)) {
throw new RuntimeException('Client only supports bolt version 4.4 and ^5.0');
}

Expand Down
Loading