et-nik / binn-php

Binn.php

Indentation +1 added lines, -1 removed lines

@@ -298,7 +298,7 @@
         if (in_array($type,
             [self::BINN_INT64, self::BINN_INT32, self::BINN_INT16,
                 self::BINN_UINT64,self::BINN_UINT32, self::BINN_UINT16])
-         ) {
+            ) {
             $type = $this->compress_int($type, $value);
         }
 

Spacing +18 added lines, -18 removed lines

@@ -53,11 +53,11 @@ 
     const BINN_BOOL         = 0x80061;
 
     const BINN_STORAGE_NOBYTES      = 0x00;
-    const BINN_STORAGE_BYTE         = 0x20;  //  8 bits
-    const BINN_STORAGE_WORD         = 0x40;  // 16 bits -- the endianess (byte order) is automatically corrected
-    const BINN_STORAGE_DWORD        = 0x60;  // 32 bits -- the endianess (byte order) is automatically corrected
-    const BINN_STORAGE_QWORD        = 0x80;  // 64 bits -- the endianess (byte order) is automatically corrected
-    const BINN_STORAGE_STRING       = 0xA0;  // Are stored with null termination
+    const BINN_STORAGE_BYTE         = 0x20; //  8 bits
+    const BINN_STORAGE_WORD         = 0x40; // 16 bits -- the endianess (byte order) is automatically corrected
+    const BINN_STORAGE_DWORD        = 0x60; // 32 bits -- the endianess (byte order) is automatically corrected
+    const BINN_STORAGE_QWORD        = 0x80; // 64 bits -- the endianess (byte order) is automatically corrected
+    const BINN_STORAGE_STRING       = 0xA0; // Are stored with null termination
     const BINN_STORAGE_BLOB         = 0xC0;
     const BINN_STORAGE_CONTAINER    = 0xE0;
 
@@ -119,7 +119,7 @@ 
      * @var int
      * @access protected
      */
-    protected $count        = 0;
+    protected $count = 0;
 
     /**
      * Data size in bytes
@@ -127,14 +127,14 @@ 
      * @var int
      * @access protected
      */
-    protected $data_size    = 0;
+    protected $data_size = 0;
 
     /**
      * Meta size in bytes
      *
      * @var int
      */
-    protected $meta_size    = self::MIN_BINN_SIZE;
+    protected $meta_size = self::MIN_BINN_SIZE;
 
     /**
      * Size bin string in bytes
@@ -142,7 +142,7 @@ 
      * @var int
      * @access protected
      */
-    protected $size         = 0;
+    protected $size = 0;
 
     /**
      * Bin string
@@ -150,7 +150,7 @@ 
      * @var string
      * @access protected
      */
-    protected $binn_string     = "";
+    protected $binn_string = "";
 
     /**
      * Object elements
@@ -297,7 +297,7 @@ 
     {
         if (in_array($type,
             [self::BINN_INT64, self::BINN_INT32, self::BINN_INT16,
-                self::BINN_UINT64,self::BINN_UINT32, self::BINN_UINT16])
+                self::BINN_UINT64, self::BINN_UINT32, self::BINN_UINT16])
          ) {
             $type = $this->compress_int($type, $value);
         }
@@ -561,7 +561,7 @@ 
         // Size
         if ($size_bytes & 1 << 7) {
             $size_bytes = unpack("N", substr($binstring, $pos, 4))[1];
-            $this->size = ($size_bytes &~ (1 << 31)); // Cut bit
+            $this->size = ($size_bytes & ~ (1 << 31)); // Cut bit
             $pos += 4;
         } else {
             $this->size = $size_bytes;
@@ -574,8 +574,8 @@ 
 
         // Size
         if ($count_bytes & 1 << 7) {
-            $count_bytes = unpack("N", substr($binstring,$pos, 4))[1];
-            $this->count = ($count_bytes &~ (1 << 31)); // Cut bit
+            $count_bytes = unpack("N", substr($binstring, $pos, 4))[1];
+            $this->count = ($count_bytes & ~ (1 << 31)); // Cut bit
             $pos += 4;
         } else {
             $this->count = $count_bytes;
@@ -648,7 +648,7 @@ 
                     // Size
                     if ($string_size & 1 << 7) {
                         $string_size = unpack("N", substr($binstring, $pos, 4))[1];
-                        $string_size = ($string_size &~ (1 << 31)); // Cut bit
+                        $string_size = ($string_size & ~ (1 << 31)); // Cut bit
                         $pos += 4;
                     } else {
                         $pos += 1;
@@ -665,13 +665,13 @@ 
                     // Size
                     if ($list_size & 1 << 7) {
                         $list_size = unpack("N", substr($binstring, $pos, 4))[1];
-                        $list_size = ($list_size &~ (1 << 31)); // Cut bit
+                        $list_size = ($list_size & ~ (1 << 31)); // Cut bit
                     }
 
-                    $substring = substr($binstring, $pos-1, $list_size);
+                    $substring = substr($binstring, $pos - 1, $list_size);
                     $this->_add_val(self::BINN_LIST, new Binn($substring));
 
-                    $pos += ($list_size-1);
+                    $pos += ($list_size - 1);
 
                     break;
 

Braces +4 added lines, -8 removed lines

@@ -205,11 +205,9 @@ 
             // Signed
             if ($val >= self::INT8_MIN) {
                 $type2 = self::BINN_INT8;
-            }
-            elseif ($val >= self::INT16_MIN) {
+            } elseif ($val >= self::INT16_MIN) {
                 $type2 = self::BINN_INT16;
-            }
-            elseif ($val >= self::INT32_MIN) {
+            } elseif ($val >= self::INT32_MIN) {
                 $type2 = self::BINN_INT32;
             }
         }
@@ -219,11 +217,9 @@ 
 
             if ($val <= self::UINT8_MAX) {
                 $type2 = self::BINN_UINT8;
-            }
-            elseif ($val <= self::UINT16_MAX) {
+            } elseif ($val <= self::UINT16_MAX) {
                 $type2 = self::BINN_UINT16;
-            }
-            elseif ($val <= self::UINT32_MAX) {
+            } elseif ($val <= self::UINT32_MAX) {
                 $type2 = self::BINN_UINT32;
             }
         }