Merge pull request #72 from marc-mabe/hotfix/71

fixes #71: fixed truncating left over bits of last byte

Author: marc-mabe

src/EnumSet.php

@@ -333,19 +333,27 @@ public function setBinaryBitsetLe($bitset)
         if (!is_string($bitset)) {
             throw new InvalidArgumentException('Bitset must be a string');
         }
-        
-        $size   = ceil($this->ordinalMax / 8);
+
+        $size   = strlen($this->bitset);
         $sizeIn = strlen($bitset);
-        
+
         if ($sizeIn < $size) {
             // add "\0" if the given bitset is not long enough
             $bitset .= str_repeat("\0", $size - $sizeIn);
         } elseif ($sizeIn > $size) {
             $bitset = substr($bitset, 0, $size);
         }
-        
-        $this->bitset = $bitset;
-        
+
+        // truncate out-of-range bits of last byte
+        $lastByteMaxOrd = $this->ordinalMax % 8;
+        if ($lastByteMaxOrd === 0) {
+            $this->bitset = $bitset;
+        } else {
+            $lastByte     = chr($lastByteMaxOrd) & $bitset[$size - 1];
+            $this->bitset = substr($bitset, 0, -1) . $lastByte;
+        }
+
+        // reset the iterator position
         $this->rewind();
     }
 

tests/MabeEnumTest/EnumSetTest.php

@@ -368,6 +368,20 @@ public function testSetBinaryBitsetLe()
         $this->assertTrue($enumSet->count() == 3);
     }
 
+    public function testSetBinaryBitsetLeTruncateHighBits()
+    {
+        $enumSet = new EnumSet('MabeEnumTest\TestAsset\Enum65');
+        foreach (Enum65::getEnumerators() as $enumerator) {
+            $enumSet->attach($enumerator);
+        }
+
+        $bitset    = $enumSet->getBinaryBitsetLe();
+        $newBitset = substr($bitset, 0, -1) . "\xff\xff";
+        $enumSet->setBinaryBitsetLe($newBitset);
+
+        $this->assertSame(bin2hex($bitset), bin2hex($enumSet->getBinaryBitsetLe()));
+    }
+
     public function testSetBinaryBitsetBe()
     {
         $enumSet = new EnumSet('MabeEnumTest\TestAsset\Enum65');