#32

src/BitMask.php

@@ -37,9 +37,12 @@ public function set(int ...$bits): void
     /** @throws NotSingleBitException */
     public function remove(int ...$bits): void
     {
-        array_walk($bits, fn(int $bit) => $this->checkBit($bit));
-        array_walk($bits, fn(int $bit) => $this->mask ^= $bit);
-        // $this->mask &= ~$bit;
+        foreach ($bits as $bit) {
+            if ($this->has($bit)) {
+                $this->mask ^= $bit;
+                // $this->mask &= ~$bit;
+            }
+        }
     }
 
     /** @throws NotSingleBitException */

src/EnumBitMask.php

@@ -49,12 +49,7 @@ public function set(UnitEnum ...$bits): void
     public function remove(UnitEnum ...$bits): void
     {
         $this->has(...$bits);
-        foreach ($bits as $bit) {
-            if (!$this->bitmask->has(...$this->enumToInt($bit))) {
-                continue;
-            }
-            $this->bitmask->remove(...$this->enumToInt($bit));
-        }
+        $this->bitmask->remove(...$this->enumToInt(...$bits));
     }
 
     /** @throws UnknownEnumException|NotSingleBitException */

tests/BitMaskTest.php

@@ -137,4 +137,14 @@ public function testToString(): void
         $bitmask->set(8);
         assertSame('15', (string) $bitmask);
     }
+
+    public function testRemoveTwice(): void
+    {
+        $bitmask = new BitMask(self::READ | self::WRITE | self::EXECUTE);
+        $bitmask->remove(self::READ);
+        assertFalse($bitmask->has(self::READ));
+        $bitmask->remove(self::READ);
+        assertFalse($bitmask->has(self::READ));
+        assertSame(self::WRITE | self::EXECUTE, $bitmask->get());
+    }
 }