added extra parameter to required places

Author: stefanak-michal

Bolt.php

@@ -191,18 +191,19 @@ private function packProtocolVersions(): string
      * @param string $name
      * @param string $user
      * @param string $password
+     * @param array $extra
      * @return bool
      * @throws Exception
      */
-    public function init(string $name, string $user, string $password): bool
+    public function init(string $name, string $user, string $password, array $extra = []): bool
     {
         if (!$this->handshake())
             return false;
 
         if (self::$debug)
             echo 'INIT';
 
-        return $this->protocol->init($name, Bolt::$scheme, $user, $password);
+        return $this->protocol->init($name, Bolt::$scheme, $user, $password, $extra);
     }
 
     /**
@@ -212,12 +213,13 @@ public function init(string $name, string $user, string $password): bool
      * @param string $name
      * @param string $user
      * @param string $password
+     * @param array $extra
      * @return bool
      * @throws Exception
      */
-    public function hello(string $name, string $user, string $password): bool
+    public function hello(string $name, string $user, string $password, array $extra = []): bool
     {
-        return $this->init($name, $user, $password);
+        return $this->init($name, $user, $password, $extra);
     }
 
     /**
@@ -237,47 +239,51 @@ public function run(string $statement, array $parameters = [], array $extra = []
     /**
      * Send PULL_ALL message
      * @version <4
+     * @param array $extra
      * @return mixed Array of records or false on error. Last array element is success message.
      */
-    public function pullAll()
+    public function pullAll(array $extra = [])
     {
         if (self::$debug)
             echo 'PULL';
-        return $this->protocol->pullAll();
+        return $this->protocol->pullAll($extra);
     }
 
     /**
      * Send PULL message
      * @version >=4
      * @internal PULL_ALL alias
+     * @param array $extra
      * @return mixed Array of records or false on error. Last array element is success message.
      */
-    public function pull()
+    public function pull(array $extra = [])
     {
-        return $this->pullAll();
+        return $this->pullAll($extra);
     }
 
     /**
      * Send DISCARD_ALL message
      * @version <4
+     * @param array $extra
      * @return bool
      */
-    public function discardAll()
+    public function discardAll(array $extra = [])
     {
         if (self::$debug)
             echo 'DISCARD';
-        return $this->protocol->discardAll();
+        return $this->protocol->discardAll($extra);
     }
 
     /**
      * Send DISCARD message
      * @version >=4
      * @internal DISCARD_ALL alias
+     * @param array $extra
      * @return bool
      */
-    public function discard(): bool
+    public function discard(array $extra = []): bool
     {
-        return $this->discardAll();
+        return $this->discardAll($extra);
     }
 
     /**

protocol/V4.php

@@ -23,9 +23,8 @@ public function pullAll(...$args)
 
     public function pull(...$args)
     {
-        if (empty($args)) {
-            $args[0]['n'] = -1;
-        }
+        // The n specifies how many records to fetch. n=-1 will fetch all records.
+        $args[0]['n'] = $args[0]['n'] ?? -1;
 
         try {
             $msg = $this->packer->pack(0x3F, (object)($args[0] ?? []));
@@ -59,7 +58,7 @@ public function discardAll(...$args): bool
     public function discard(...$args): bool
     {
         try {
-            $msg = $this->packer->pack(0x2F, $args[0] ?? []);
+            $msg = $this->packer->pack(0x2F, (object)($args[0] ?? []));
         } catch (Exception $ex) {
             Bolt::error($ex->getMessage());
             return false;