et-nik / binn-php

src/Binn.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
      * @var int
      * @access protected
      */
-    protected $size         = 0;
+    protected $size = 0;
 
     /**
      * Bin string
@@ -33,7 +33,7 @@ 
      * @var string
      * @access protected
      */
-    protected $binnString     = "";
+    protected $binnString = "";
 
     /**
      * Binn constructor

src/BinnList.php

Spacing +10 added lines, -10 removed lines

@@ -144,7 +144,7 @@ 
      */
     public static function validArray($array)
     {
-        $array = (array)$array;
+        $array = (array) $array;
         if (self::isArrayAssoc($array)) {
             return false;
         }
@@ -214,7 +214,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->compressInt($type, $value);
         }
@@ -244,7 +244,7 @@ 
         // Size
         if ($sizeBytes & 1 << 7) {
             $sizeBytes = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-            $this->size = ($sizeBytes &~ (1 << 31)); // Cut bit
+            $this->size = ($sizeBytes & ~ (1 << 31)); // Cut bit
             $pos += 4;
         } else {
             $this->size = $sizeBytes;
@@ -258,7 +258,7 @@ 
         // Size
         if ($countBytes & 1 << 7) {
             $countBytes = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-            $this->count = ($countBytes &~ (1 << 31)); // Cut bit
+            $this->count = ($countBytes & ~ (1 << 31)); // Cut bit
             $pos += 4;
         } else {
             $this->count = $countBytes;
@@ -285,13 +285,13 @@ 
                 $this->_addVal($varType, $val);
                 $pos += $varSize['data'];
 
-            } else if ($varStorageType === self::BINN_STRING ) {
+            } else if ($varStorageType === self::BINN_STRING) {
                 $stringSize = $this->unpack(self::BINN_UINT8, $binnString[$pos]);
 
                 // Size
                 if ($stringSize & 1 << 7) {
                     $stringSize = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-                    $stringSize = ($stringSize &~ (1 << 31)); // Cut bit
+                    $stringSize = ($stringSize & ~ (1 << 31)); // Cut bit
                     $pos += 4;
                 } else {
                     $pos += 1;
@@ -305,15 +305,15 @@ 
                 $pos += $stringSize;
                 $pos += 1; // Null byte
             } else if ($varStorageType === self::BINN_STORAGE_CONTAINER) {
-                $list_size = $this->unpack(self::BINN_UINT8, $binnString[$pos]);;
+                $list_size = $this->unpack(self::BINN_UINT8, $binnString[$pos]); ;
 
                 // Size
                 if ($list_size & 1 << 7) {
                     $list_size = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-                    $list_size = ($list_size &~ (1 << 31)); // Cut bit
+                    $list_size = ($list_size & ~ (1 << 31)); // Cut bit
                 }
 
-                $substring = substr($binnString, $pos-1, $list_size);
+                $substring = substr($binnString, $pos - 1, $list_size);
 
                 foreach ($this->containersClasses as $containerType => $containersClass) {
                     if ($containerType === $varType) {
@@ -323,7 +323,7 @@ 
                     }
                 }
 
-                $pos += ($list_size-1);
+                $pos += ($list_size - 1);
             } else {
                 $stop_while = true;
             }

src/BinnObject.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
         // Size
         if ($sizeBytes & 1 << 7) {
             $sizeBytes = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-            $this->size = ($sizeBytes &~ (1 << 31)); // Cut bit
+            $this->size = ($sizeBytes & ~ (1 << 31)); // Cut bit
             $pos += 4;
         } else {
             $this->size = $sizeBytes;
@@ -44,7 +44,7 @@ 
         // Size
         if ($countBytes & 1 << 7) {
             $countBytes = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-            $this->count = ($countBytes &~ (1 << 31)); // Cut bit
+            $this->count = ($countBytes & ~ (1 << 31)); // Cut bit
             $pos += 4;
         } else {
             $this->count = $countBytes;
@@ -78,19 +78,19 @@ 
                 $this->_addVal($varKey, $varType, $val);
                 $pos += $varSize['data'];
 
-            } else if ($varStorageType === self::BINN_STRING ) {
+            } else if ($varStorageType === self::BINN_STRING) {
                 $stringSize = $this->unpack(self::BINN_UINT8, $binnString[$pos]);
 
                 // Size
                 if ($stringSize & 1 << 7) {
                     $stringSize = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-                    $stringSize = ($stringSize &~ (1 << 31)); // Cut bit
+                    $stringSize = ($stringSize & ~ (1 << 31)); // Cut bit
                     $pos += 4;
                 } else {
                     $pos += 1;
                 }
 
-                $this->_addVal($varKey,self::BINN_STRING, $this->unpack(
+                $this->_addVal($varKey, self::BINN_STRING, $this->unpack(
                     self::BINN_STRING,
                     substr($binnString, $pos, $stringSize)
                 ));
@@ -98,15 +98,15 @@ 
                 $pos += $stringSize;
                 $pos += 1; // Null byte
             } else if ($varStorageType === self::BINN_STORAGE_CONTAINER) {
-                $list_size = $this->unpack(self::BINN_UINT8, $binnString[$pos]);;
+                $list_size = $this->unpack(self::BINN_UINT8, $binnString[$pos]); ;
 
                 // Size
                 if ($list_size & 1 << 7) {
                     $list_size = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-                    $list_size = ($list_size &~ (1 << 31)); // Cut bit
+                    $list_size = ($list_size & ~ (1 << 31)); // Cut bit
                 }
 
-                $substring = substr($binnString, $pos-1, $list_size);
+                $substring = substr($binnString, $pos - 1, $list_size);
 
                 foreach ($this->containersClasses as $containerType => $containersClass) {
                     if ($containerType === $varType) {
@@ -116,7 +116,7 @@ 
                     }
                 }
 
-                $pos += ($list_size-1);
+                $pos += ($list_size - 1);
             } else {
                 $stopWhile = true;
             }
@@ -197,7 +197,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->compressInt($type, $value);
         }
@@ -228,7 +228,7 @@ 
      */
     public static function validArray($array)
     {
-        $array = (array)$array;
+        $array = (array) $array;
 
         /*
         if (count(array_filter(array_keys($array), 'is_string')) > 0) {
@@ -255,7 +255,7 @@ 
 
         $this->binnFree();
 
-        if (! $this->isArrayAssoc($array)) {
+        if (!$this->isArrayAssoc($array)) {
             throw new InvalidArrayException('Array should be associative');
         }
 

src/BinnAbstract.php

Spacing +15 added lines, -15 removed lines

@@ -19,18 +19,18 @@ 
     const BINN_INT64        = 0x81;
     const BINN_STRING       = 0xA0;
 
-    const BINN_FLOAT32      = 0x62;  // (DWORD)
-    const BINN_FLOAT64      = 0x82;  // (QWORD)
+    const BINN_FLOAT32      = 0x62; // (DWORD)
+    const BINN_FLOAT64      = 0x82; // (QWORD)
     const BINN_FLOAT        = self::BINN_FLOAT32;
 
     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;
 
@@ -82,7 +82,7 @@ 
      * @var int
      * @access protected
      */
-    protected $count        = 0;
+    protected $count = 0;
 
     /**
      * Data size in bytes
@@ -90,14 +90,14 @@ 
      * @var int
      * @access protected
      */
-    protected $dataSize    = 0;
+    protected $dataSize = 0;
 
     /**
      * Meta size in bytes
      *
      * @var int
      */
-    protected $metaSize    = self::MIN_BINN_SIZE;
+    protected $metaSize = self::MIN_BINN_SIZE;
 
     /**
      * Size bin string in bytes
@@ -105,7 +105,7 @@ 
      * @var int
      * @access protected
      */
-    protected $size         = 0;
+    protected $size = 0;
 
     /**
      * Bin string
@@ -113,7 +113,7 @@ 
      * @var string
      * @access protected
      */
-    protected $binnString     = "";
+    protected $binnString = "";
 
     /**
      * Object elements
@@ -242,7 +242,7 @@ 
      */
     protected static function isArrayAssoc($arr)
     {
-        $arr = (array)$arr;
+        $arr = (array) $arr;
         if (array() === $arr) return false;
         return array_keys($arr) !== range(0, count($arr) - 1);
     }
@@ -253,7 +253,7 @@ 
      */
     protected static function isArrayObject($arr)
     {
-        foreach(array_keys($arr) as $key) {
+        foreach (array_keys($arr) as $key) {
             if (!is_int($key)) {
                 return true;
             }
@@ -392,7 +392,7 @@ 
 
         // Initial meta size 3 bytes
         // Type byte + Size byte + Item counts byte
-        $this->metaSize    = self::MIN_BINN_SIZE;
+        $this->metaSize = self::MIN_BINN_SIZE;
 
         $this->size         = 0;
         $this->binnString   = "";

Braces +7 added lines, -9 removed lines

@@ -243,7 +243,9 @@ 
     protected static function isArrayAssoc($arr)
     {
         $arr = (array)$arr;
-        if (array() === $arr) return false;
+        if (array() === $arr) {
+            return false;
+        }
         return array_keys($arr) !== range(0, count($arr) - 1);
     }
 
@@ -357,11 +359,9 @@ 
             // Signed
             if ($val >= self::INT8_MIN) {
                 $newType = self::BINN_INT8;
-            }
-            elseif ($val >= self::INT16_MIN) {
+            } elseif ($val >= self::INT16_MIN) {
                 $newType = self::BINN_INT16;
-            }
-            elseif ($val >= self::INT32_MIN) {
+            } elseif ($val >= self::INT32_MIN) {
                 $newType = self::BINN_INT32;
             }
         }
@@ -371,11 +371,9 @@ 
 
             if ($val <= self::UINT8_MAX) {
                 $newType = self::BINN_UINT8;
-            }
-            elseif ($val <= self::UINT16_MAX) {
+            } elseif ($val <= self::UINT16_MAX) {
                 $newType = self::BINN_UINT16;
-            }
-            elseif ($val <= self::UINT32_MAX) {
+            } elseif ($val <= self::UINT32_MAX) {
                 $newType = self::BINN_UINT32;
             }
         }

src/BinnMap.php

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,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->compressInt($type, $value);
         }
@@ -73,7 +73,7 @@ 
         // Size
         if ($sizeBytes & 1 << 7) {
             $sizeBytes = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-            $this->size = ($sizeBytes &~ (1 << 31)); // Cut bit
+            $this->size = ($sizeBytes & ~ (1 << 31)); // Cut bit
             $pos += 4;
         } else {
             $this->size = $sizeBytes;
@@ -87,7 +87,7 @@ 
         // Size
         if ($countBytes & 1 << 7) {
             $countBytes = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-            $this->count = ($countBytes &~ (1 << 31)); // Cut bit
+            $this->count = ($countBytes & ~ (1 << 31)); // Cut bit
             $pos += 4;
         } else {
             $this->count = $countBytes;
@@ -117,19 +117,19 @@ 
                 $this->_addVal($varKey, $varType, $val);
                 $pos += $varSize['data'];
 
-            } else if ($varStorageType === self::BINN_STRING ) {
+            } else if ($varStorageType === self::BINN_STRING) {
                 $stringSize = $this->unpack(self::BINN_UINT8, $binnString[$pos]);
 
                 // Size
                 if ($stringSize & 1 << 7) {
                     $stringSize = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-                    $stringSize = ($stringSize &~ (1 << 31)); // Cut bit
+                    $stringSize = ($stringSize & ~ (1 << 31)); // Cut bit
                     $pos += 4;
                 } else {
                     $pos += 1;
                 }
 
-                $this->_addVal($varKey,self::BINN_STRING, $this->unpack(
+                $this->_addVal($varKey, self::BINN_STRING, $this->unpack(
                     self::BINN_STRING,
                     substr($binnString, $pos, $stringSize)
                 ));
@@ -137,15 +137,15 @@ 
                 $pos += $stringSize;
                 $pos += 1; // Null byte
             } else if ($varStorageType === self::BINN_STORAGE_CONTAINER) {
-                $list_size = $this->unpack(self::BINN_UINT8, $binnString[$pos]);;
+                $list_size = $this->unpack(self::BINN_UINT8, $binnString[$pos]); ;
 
                 // Size
                 if ($list_size & 1 << 7) {
                     $list_size = $this->unpack(self::BINN_UINT32, substr($binnString, $pos, 4));
-                    $list_size = ($list_size &~ (1 << 31)); // Cut bit
+                    $list_size = ($list_size & ~ (1 << 31)); // Cut bit
                 }
 
-                $substring = substr($binnString, $pos-1, $list_size);
+                $substring = substr($binnString, $pos - 1, $list_size);
 
                 foreach ($this->containersClasses as $containerType => $containersClass) {
                     if ($containerType === $varType) {
@@ -155,7 +155,7 @@ 
                     }
                 }
 
-                $pos += ($list_size-1);
+                $pos += ($list_size - 1);
             } else {
                 $stopWhile = true;
             }
@@ -224,7 +224,7 @@ 
      */
     public static function validArray($array)
     {
-        $array = (array)$array;
+        $array = (array) $array;
         if (!self::isArrayAssoc($array)) {
             return false;
         }
@@ -248,7 +248,7 @@ 
 
         $this->binnFree();
 
-        if (! $this->isArrayAssoc($array)) {
+        if (!$this->isArrayAssoc($array)) {
             throw new InvalidArrayException('Array should be associative');
         }