greenlit tests

Author: transistive

src/Bolt.php

@@ -48,7 +48,7 @@ final class Bolt
     /**
      * @var array
      */
-    private $versions = [4.1, 4, 3];
+    private $versions = [4.3, 4.2, 4.1, 4, 3];
 
     /**
      * @var float
@@ -138,7 +138,7 @@ private function handshake(): bool
             echo 'HANDSHAKE';
 
         $this->connection->write(chr(0x60) . chr(0x60) . chr(0xb0) . chr(0x17));
-        $this->connection->write($this->packProtocolVersions());
+        $this->connection->write(chr(0x00) . chr(0x03) . chr(0x03) . chr(0x04) . chr(0x00) . chr(0x00) . chr(0x01) . chr(0x04) . chr(0x00) . chr(0x00) . chr(0x00) . chr(0x04) . chr(0x00) . chr(0x00) . chr(0x00) . chr(0x03));
 
         $this->unpackProtocolVersion();
         if (empty($this->version)) {
@@ -396,14 +396,15 @@ public function __destruct()
      *
      * @param array|null $routing
      *
-     * @return array|null
+     * @return array{rt: array{servers: list<array{addresses: list<string>, role: 'WRITE'|'READ'|'ROUTE'}>, ttl: int}}|null
      */
     public function route(?array $routing = null): ?array
     {
         if (!method_exists($this->protocol, 'route')) {
             return null;
         }
 
+        $routing = $routing ?? ['address' => $this->connection->getIp() . ':' . $this->connection->getPort()];
         return $this->protocol->route($routing);
     }
 }

src/connection/AConnection.php

@@ -56,4 +56,19 @@ protected function printHex(string $str, bool $write = true)
         }
         echo '</pre>';
     }
+
+    public function getIp(): string
+    {
+        return $this->ip;
+    }
+
+    public function getPort(): int
+    {
+        return $this->port;
+    }
+
+    public function getTimeout(): float
+    {
+        return $this->timeout;
+    }
 }

src/connection/IConnection.php

@@ -25,4 +25,10 @@ public function write(string $buffer);
     public function read(int $length = 2048): string;
 
     public function disconnect();
+
+    public function getIp(): string;
+
+    public function getPort(): int;
+
+    public function getTimeout(): float;
 }

src/connection/Socket.php

@@ -125,5 +125,4 @@ public function disconnect()
             @socket_close($this->socket);
         }
     }
-
 }

src/protocol/V4_3.php

@@ -16,9 +16,9 @@
  */
 class V4_3 extends V4_1
 {
-    public function route(?array $routing = null): array
+    public function route(array $routing, ?array $bookmarks = null, ?string $database=null): array
     {
-        $this->write($this->packer->pack(0x66, $routing ?? []));
+        $this->write($this->packer->pack(0x66, (object) $routing, $bookmarks ?? [], $database));
 
         $signature = 0;
         $output = $this->read($signature);

tests/BoltTest.php

@@ -3,6 +3,7 @@
 namespace Bolt\tests;
 
 use Bolt\Bolt;
+use Bolt\protocol\V4_3;
 use Exception;
 
 /**
@@ -165,4 +166,20 @@ private function formatParameter(Bolt $bolt, string $name): string
         return self::$parameterType ? ('{' . $name . '}') : ('$' . $name);
     }
 
+
+
+    /**
+     * @depends testHello
+     * @param Bolt $bolt
+     */
+    public function testRoute(Bolt $bolt): void
+    {
+        $version = $bolt->getProtocolVersion();
+        if ($version >= 4.3) {
+            $route = $bolt->route();
+            self::assertNotEmpty($route);
+        } else {
+            self::assertNull($bolt->route());
+        }
+    }
 }

tests/protocol/V4_3Test.php

@@ -29,14 +29,4 @@ public function test__construct()
         return $cls;
     }
 
-    /**
-     * @return V4_3
-     */
-    public function testRoute(): void
-    {
-        $v4_3 = $this->test__construct();
-
-        self::assertEquals([], $v4_3->route());
-    }
-
 }