Unified logic for new bolt messages. Instead of updating Interface and Abstract class every new method has to ask if it exists. Refactored route method and moved destructor to last place as it should be.

Author: stefanak-michal

src/Bolt.php

@@ -322,6 +322,7 @@ public function discard(int $n = -1, int $qid = -1): bool
 
     /**
      * Send BEGIN message
+     * @version >=3
      * @param array $extra extra::Dictionary(bookmarks::List<String>, tx_timeout::Integer, tx_metadata::Dictionary, mode::String, db:String)
     <pre>The bookmarks is a list of strings containg some kind of bookmark identification e.g [“neo4j-bookmark-transaction:1”, “neo4j-bookmark-transaction:2”]
     The tx_timeout is an integer in that specifies a transaction timeout in ms.
@@ -335,31 +336,33 @@ public function begin(array $extra = []): bool
     {
         if (self::$debug)
             echo 'BEGIN';
-        return $this->protocol->begin($extra);
+        return method_exists($this->protocol, 'begin') && $this->protocol->begin($extra);
     }
 
     /**
      * Send COMMIT message
+     * @version >=3
      * @return bool
      * @throws Exception
      */
     public function commit(): bool
     {
         if (self::$debug)
             echo 'COMMIT';
-        return $this->protocol->commit();
+        return method_exists($this->protocol, 'commit') && $this->protocol->commit();
     }
 
     /**
      * Send ROLLBACK message
+     * @version >=3
      * @return bool
      * @throws Exception
      */
     public function rollback(): bool
     {
         if (self::$debug)
             echo 'ROLLBACK';
-        return $this->protocol->rollback();
+        return method_exists($this->protocol, 'rollback') && $this->protocol->rollback();
     }
 
     /**
@@ -374,6 +377,22 @@ public function reset(): bool
         return $this->protocol->reset();
     }
 
+    /**
+     * Send ROUTE message to instruct the server to return the current routing table.
+     * @version >=4.3 In previous versions there was no explicit message for this and a procedure had to be invoked using Cypher through the RUN and PULL messages.
+     * @param array|null $routing
+     * @param array $bookmarks
+     * @param array|string|null $extra
+     * @return array|null
+     */
+    public function route(?array $routing = null, array $bookmarks = [], $extra = null): ?array
+    {
+        if (self::$debug)
+            echo 'ROUTE';
+        $routing = $routing ?? ['address' => $this->connection->getIp() . ':' . $this->connection->getPort()];
+        return method_exists($this->protocol, 'route') ? $this->protocol->route($routing, $bookmarks, $extra) : null;
+    }
+
     /**
      * Say goodbye
      */
@@ -382,26 +401,9 @@ public function __destruct()
         if ($this->protocol instanceof AProtocol) {
             if (self::$debug)
                 echo 'GOODBYE';
-            $this->protocol->goodbye();
+            method_exists($this->protocol, 'goodbye') && $this->protocol->goodbye();
         }
 
         $this->connection->disconnect();
     }
-
-    /**
-     * Fetch the current routing table, if the message specification allows it.
-     * @param array|null $routing
-     * @return array|null
-     */
-    public function route(?array $routing = null): ?array
-    {
-        if (self::$debug)
-            echo 'ROUTE';
-
-        if (!method_exists($this->protocol, 'route'))
-            return null;
-
-        $routing = $routing ?? ['address' => $this->connection->getIp() . ':' . $this->connection->getPort()];
-        return $this->protocol->route($routing);
-    }
 }

src/protocol/AProtocol.php

@@ -50,26 +50,6 @@ public function __construct(IPacker $packer, IUnpacker $unpacker, IConnection $c
         $this->connection = $connection;
     }
 
-    public function begin(...$args): bool
-    {
-        return false;
-    }
-
-    public function commit(...$args): bool
-    {
-        return false;
-    }
-
-    public function rollback(...$args): bool
-    {
-        return false;
-    }
-
-    public function goodbye(...$args)
-    {
-
-    }
-
     /**
      * Write to connection
      * @param Generator $generator

src/protocol/IProtocol.php

@@ -46,31 +46,4 @@ public function discardAll(...$args): bool;
      */
     public function reset(...$args): bool;
 
-    /**
-     * Send BEGIN message
-     * @param mixed ...$args
-     * @return bool
-     */
-    public function begin(...$args): bool;
-
-    /**
-     * Send COMMIT message
-     * @param mixed ...$args
-     * @return bool
-     */
-    public function commit(...$args): bool;
-
-    /**
-     * Send ROLLBACK message
-     * @param mixed ...$args
-     * @return bool
-     */
-    public function rollback(...$args): bool;
-
-    /**
-     * Send GOODBYE message
-     * @param mixed ...$args
-     */
-    public function goodbye(...$args);
-
 }

src/protocol/V4_3.php

@@ -4,6 +4,7 @@
 
 use Bolt\error\MessageException;
 use Bolt\error\PackException;
+use Exception;
 
 /**
  * Class Protocol version 4.3
@@ -18,8 +19,7 @@ class V4_3 extends V4_2
     /**
      * @param array|string|null ...$args
      * @return array
-     * @throws MessageException
-     * @throws PackException
+     * @throws Exception
      */
     public function route(...$args): array
     {