Fixed issue with unpack. Added const visibility.

Author: stefanak-michal

Bolt.php

@@ -13,10 +13,10 @@
  */
 class Bolt
 {
-    const SUCCESS = 0x70;
-    const FAILURE = 0x7F;
-    const IGNORED = 0x7E;
-    const RECORD = 0x71;
+    private const SUCCESS = 0x70;
+    private const FAILURE = 0x7F;
+    private const IGNORED = 0x7E;
+    private const RECORD = 0x71;
 
     /**
      * @var Packer
@@ -284,7 +284,7 @@ private function read()
         $signature = 0;
         if (!empty($msg)) {
             if (self::$debug) {
-                self::printHex($msg);
+                self::printHex($msg, false);
             }
 
             try {
@@ -347,7 +347,9 @@ private function error(string $msg, string $code = '')
         if (is_callable(self::$errorHandler)) {
             call_user_func(self::$errorHandler, $msg, $code);
         } else {
-            $msg .= ' (' . $code . ')';
+            if (!empty($code)) {
+                $msg .= ' (' . $code . ')';
+            }
             throw new Exception($msg);
         }
     }
@@ -356,10 +358,11 @@ private function error(string $msg, string $code = '')
      * Print buffer as HEX
      * @param string $str
      */
-    public static function printHex(string $str)
+    public static function printHex(string $str, bool $write = true)
     {
         $str = implode(unpack('H*', $str));
         echo '<pre>';
+        echo $write ? '> ' : '< ';
         foreach (str_split($str, 8) as $chunk) {
             echo implode(' ', str_split($chunk, 2));
             echo '    ';

Packer.php

@@ -2,6 +2,8 @@
 
 namespace Bolt;
 
+use Exception;
+
 /**
  * Class Packer
  * Pack bolt messages

Unpacker.php

@@ -3,6 +3,7 @@
 namespace Bolt;
 
 use Bolt\structures\{Node, Path, Relationship, UnboundRelationship};
+use Exception;
 
 /**
  * Class Unpacker
@@ -46,10 +47,11 @@ public function unpack(string $msg, int &$signature = 0)
 
     /**
      * @param string $msg
+     * @param bool $structures
      * @return mixed
      * @throws Exception
      */
-    private function u(string &$msg)
+    private function u(string &$msg, bool $structures = true)
     {
         if (empty($msg)) {
             return false;
@@ -59,26 +61,29 @@ private function u(string &$msg)
         $msg = mb_strcut($msg, 1, null, '8bit');
         $result = false;
 
-        $output = $this->unpackStruct($marker, $msg, $result);
-        if ($result) {
-            return $output;
-        }
-        $output = $this->unpackNode($marker, $msg, $result);
-        if ($result) {
-            return $output;
-        }
-        $output = $this->unpackRelationship($marker, $msg, $result);
-        if ($result) {
-            return $output;
-        }
-        $output = $this->unpackPath($marker, $msg, $result);
-        if ($result) {
-            return $output;
-        }
-        $output = $this->unpackUnboundRelationship($marker, $msg, $result);
-        if ($result) {
-            return $output;
+        if ($structures) {
+            $output = $this->unpackStruct($marker, $msg, $result);
+            if ($result) {
+                return $output;
+            }
+            $output = $this->unpackNode($marker, $msg, $result);
+            if ($result) {
+                return $output;
+            }
+            $output = $this->unpackRelationship($marker, $msg, $result);
+            if ($result) {
+                return $output;
+            }
+            $output = $this->unpackPath($marker, $msg, $result);
+            if ($result) {
+                return $output;
+            }
+            $output = $this->unpackUnboundRelationship($marker, $msg, $result);
+            if ($result) {
+                return $output;
+            }
         }
+        
         $output = $this->unpackFloat($marker, $msg, $result);
         if ($result) {
             return $output;
@@ -327,9 +332,9 @@ private function unpackMap(int $marker, string &$msg, bool &$result = false): ar
             $key = null;
             for ($i = 0; $i < $size * 2; $i++) {
                 if ($i % 2 == 0) {
-                    $key = $this->u($msg);
+                    $key = $this->u($msg, false);
                 } else {
-                    $output[$key] = $this->u($msg);
+                    $output[$key] = $this->u($msg, false);
                 }
             }
             $result = true;