EnumSet: get as array methods

 - added getOrdinals()
 - optimized getEnumerators(), getNames() and getValues()
 - added tests for all get*() methods

Author: marc-mabe

src/EnumSet.php

@@ -240,14 +240,38 @@ public function isSuperset(EnumSet $other)
         return ($thisBitset | $other->getBinaryBitsetLe()) === $thisBitset;
     }
 
+    /**
+     * Get ordinal numbers of the defined enumerators as array
+     * @return int[]
+     */
+    public function getOrdinals()
+    {
+        $ordinals = array();
+        $byteLen  = strlen($this->bitset);
+
+	for ($bytePos = 0; $bytePos < $byteLen; ++$bytePos) {
+            if ($this->bitset[$bytePos] === "\0") {
+                continue; // fast skip null byte
+            }
+
+            for ($bitPos = 0; $bitPos < 8; ++$bitPos) {
+                if ((ord($this->bitset[$bytePos]) & (1 << $bitPos)) !== 0) {
+                    $ordinals[] = $bytePos * 8 + $bitPos;
+                }
+            }
+        }
+
+        return $ordinals;
+    }
+
     /**
      * Get values of the defined enumerators as array
      * @return null[]|bool[]|int[]|float[]|string[]
      */
     public function getValues()
     {
         $values = array();
-        foreach ($this as $enumerator) {
+        foreach ($this->getEnumerators() as $enumerator) {
             $values[] = $enumerator->getValue();
         }
         return $values;
@@ -260,7 +284,7 @@ public function getValues()
     public function getNames()
     {
         $names = array();
-        foreach ($this as $enumerator) {
+        foreach ($this->getEnumerators() as $enumerator) {
             $names[] = $enumerator->getName();
         }
         return $names;
@@ -272,9 +296,10 @@ public function getNames()
      */
     public function getEnumerators()
     {
+        $enumeration = $this->enumeration;
         $enumerators = array();
-        foreach ($this as $enumerator) {
-            $enumerators[] = $enumerator->getName();
+        foreach ($this->getOrdinals() as $ord) {
+            $enumerators[] = $enumeration::getByOrdinal($ord);
         }
         return $enumerators;
     }

tests/MabeEnumTest/EnumSetTest.php

@@ -566,4 +566,96 @@ public function testIsSupersetWrongInstance()
             $this->assertFalse($set1->isSuperset($set2));
         }
     }
+
+    public function testGetOrdinals()
+    {
+        $set = new EnumSet('MabeEnumTest\TestAsset\EnumBasic');
+        $this->assertSame(array(), $set->getOrdinals());
+
+        foreach (EnumBasic::getConstants() as $value) {
+            $set->attach($value);
+        }
+
+        $this->assertSame(range(0, count(EnumBasic::getConstants()) - 1), $set->getOrdinals());
+    }
+
+    public function testGetOrdinalsDoesNotEffectIteratorPosition()
+    {
+        $set = new EnumSet('MabeEnumTest\TestAsset\EnumBasic');
+        $set->attach(EnumBasic::ONE);
+        $set->attach(EnumBasic::TWO);
+        $set->next();
+
+        $set->getOrdinals();
+        $this->assertSame(EnumBasic::TWO, $set->current()->getValue());
+    }
+
+    public function testGetEnumerators()
+    {
+        $set = new EnumSet('MabeEnumTest\TestAsset\EnumBasic');
+        $this->assertSame(array(), $set->getEnumerators());
+
+        foreach (EnumBasic::getConstants() as $value) {
+            $set->attach($value);
+        }
+
+        $this->assertSame(EnumBasic::getEnumerators(), $set->getEnumerators());
+    }
+
+    public function testGetEnumeratorsDoesNotEffectIteratorPosition()
+    {
+        $set = new EnumSet('MabeEnumTest\TestAsset\EnumBasic');
+        $set->attach(EnumBasic::ONE);
+        $set->attach(EnumBasic::TWO);
+        $set->next();
+
+        $set->getEnumerators();
+        $this->assertSame(EnumBasic::TWO, $set->current()->getValue());
+    }
+
+    public function testGetValues()
+    {
+        $set = new EnumSet('MabeEnumTest\TestAsset\EnumBasic');
+        $this->assertSame(array(), $set->getValues());
+
+        foreach (EnumBasic::getConstants() as $value) {
+            $set->attach($value);
+        }
+
+        $this->assertSame(array_values(EnumBasic::getConstants()), $set->getValues());
+    }
+
+    public function testGetValuesDoesNotEffectIteratorPosition()
+    {
+        $set = new EnumSet('MabeEnumTest\TestAsset\EnumBasic');
+        $set->attach(EnumBasic::ONE);
+        $set->attach(EnumBasic::TWO);
+        $set->next();
+
+        $set->getValues();
+        $this->assertSame(EnumBasic::TWO, $set->current()->getValue());
+    }
+
+    public function testGetNames()
+    {
+        $set = new EnumSet('MabeEnumTest\TestAsset\EnumBasic');
+        $this->assertSame(array(), $set->getNames());
+
+        foreach (EnumBasic::getConstants() as $value) {
+            $set->attach($value);
+        }
+
+        $this->assertSame(array_keys(EnumBasic::getConstants()), $set->getNames());
+    }
+
+    public function testGetNamesDoesNotEffectIteratorPosition()
+    {
+        $set = new EnumSet('MabeEnumTest\TestAsset\EnumBasic');
+        $set->attach(EnumBasic::ONE);
+        $set->attach(EnumBasic::TWO);
+        $set->next();
+
+        $set->getNames();
+        $this->assertSame(EnumBasic::TWO, $set->current()->getValue());
+    }
 }