fixed EnumSet::[attach|detach]Enumerators() in case an error happens in the middle of modifying

Author: marc-mabe

src/EnumSet.php

@@ -140,8 +140,16 @@ public function withEnumerator($enumerator): self
      */
     public function attachEnumerators(iterable $enumerators): void
     {
-        foreach ($enumerators as $enumerator) {
-            $this->{$this->fnDoSetBit}(($this->enumeration)::get($enumerator)->getOrdinal());
+        $bitset = $this->bitset;
+
+        try {
+            foreach ($enumerators as $enumerator) {
+                $this->{$this->fnDoSetBit}(($this->enumeration)::get($enumerator)->getOrdinal());
+            }
+        } catch (\Throwable $e) {
+            // reset all changes until error happened
+            $this->bitset = $bitset;
+            throw $e;
         }
     }
 
@@ -192,8 +200,16 @@ public function withoutEnumerator($enumerator): self
      */
     public function detachEnumerators(iterable $enumerators): void
     {
-        foreach ($enumerators as $enumerator) {
-            $this->{$this->fnDoUnsetBit}(($this->enumeration)::get($enumerator)->getOrdinal());
+        $bitset = $this->bitset;
+
+        try {
+            foreach ($enumerators as $enumerator) {
+                $this->{$this->fnDoUnsetBit}(($this->enumeration)::get($enumerator)->getOrdinal());
+            }
+        } catch (\Throwable $e) {
+            // reset all changes until error happened
+            $this->bitset = $bitset;
+            throw $e;
         }
     }
 

tests/MabeEnumTest/EnumSetTest.php

@@ -270,6 +270,36 @@ public function getIntegerEnumerations()
         ];
     }
 
+    public function testAttachAtOnceAllOrNone()
+    {
+        $set = new EnumSet(EnumBasic::class);
+        $set->attachEnumerator(EnumBasic::ONE);
+
+        try {
+            $set->attachEnumerators([EnumBasic::TWO, 'unknown']);
+        } catch (InvalidArgumentException $e) {
+            // exception expected
+        } finally {
+            $this->assertTrue($set->contains(EnumBasic::ONE));
+            $this->assertFalse($set->contains(EnumBasic::TWO));
+        }
+    }
+
+    public function testDetachAtOnceAllOrNone()
+    {
+        $set = new EnumSet(EnumBasic::class);
+        $set->attachEnumerators([EnumBasic::ONE]);
+
+        try {
+            $set->detachEnumerators([EnumBasic::ONE, EnumBasic::TWO, 'unknown']);
+        } catch (InvalidArgumentException $e) {
+            // exception expected
+        } finally {
+            $this->assertTrue($set->contains(EnumBasic::ONE));
+            $this->assertFalse($set->contains(EnumBasic::TWO));
+        }
+    }
+
     public function testGetBit()
     {
         $set = new EnumSet(EnumBasic::class);