Merge pull request #61 from DCMNMarc/enumset_infinitive_loop

Fixed #60: Infinitive loop on counting empty set based on empty enum

Author: marc-mabe

src/EnumSet.php

@@ -189,11 +189,12 @@ public function count()
     {
         $cnt = 0;
         $ord = 0;
-        do {
+
+        while ($ord !== $this->ordinalMax) {
             if ($this->getBit($ord++)) {
                 ++$cnt;
             }
-        } while ($ord !== $this->ordinalMax);
+        }
 
         return $cnt;
     }

tests/MabeEnumTest/EnumSetTest.php

@@ -3,6 +3,7 @@
 namespace MabeEnumTest;
 
 use MabeEnum\EnumSet;
+use MabeEnumTest\TestAsset\EmptyEnum;
 use MabeEnumTest\TestAsset\EnumBasic;
 use MabeEnumTest\TestAsset\EnumInheritance;
 use MabeEnumTest\TestAsset\Enum32;
@@ -317,4 +318,10 @@ public function testFalseBitsetArgumentExceptionIfNotString()
         $enum = new EnumSet('MabeEnumTest\TestAsset\Enum65');
         $enum->setBitset(0);
     }
+
+    public function testCountingEmptyEnumEmptySet()
+    {
+        $set = new EnumSet('MabeEnumTest\TestAsset\EmptyEnum');
+        $this->assertSame(0, $set->count());
+    }
 }