Merge pull request #75 from marc-mabe/optimized_enumset

Optimized EnumSet by:
 - one less iteration on getValues() and getNames()
 - use EnumSet properties directly instead of using getter methods

Author: marc-mabe

src/EnumSet.php

@@ -211,8 +211,8 @@ public function count()
      */
     public function isEqual(EnumSet $other)
     {
-        return $this->getEnumeration() === $other->getEnumeration()
-            && $this->getBinaryBitsetLe() === $other->getBinaryBitsetLe();
+        return $this->enumeration === $other->enumeration
+            && $this->bitset === $other->bitset;
     }
 
     /**
@@ -222,12 +222,11 @@ public function isEqual(EnumSet $other)
      */
     public function isSubset(EnumSet $other)
     {
-        if ($this->getEnumeration() !== $other->getEnumeration()) {
+        if ($this->enumeration !== $other->enumeration) {
             return false;
         }
 
-        $thisBitset = $this->getBinaryBitsetLe();
-        return ($thisBitset & $other->getBinaryBitsetLe()) === $thisBitset;
+        return ($this->bitset & $other->bitset) === $this->bitset;
     }
 
     /**
@@ -237,12 +236,11 @@ public function isSubset(EnumSet $other)
      */
     public function isSuperset(EnumSet $other)
     {
-        if ($this->getEnumeration() !== $other->getEnumeration()) {
+        if ($this->enumeration !== $other->enumeration) {
             return false;
         }
 
-        $thisBitset = $this->getBinaryBitsetLe();
-        return ($thisBitset | $other->getBinaryBitsetLe()) === $thisBitset;
+        return ($this->bitset | $other->bitset) === $this->bitset;
     }
 
     /**
@@ -375,9 +373,10 @@ public function getOrdinals()
      */
     public function getValues()
     {
-        $values = array();
-        foreach ($this->getEnumerators() as $enumerator) {
-            $values[] = $enumerator->getValue();
+        $enumeration = $this->enumeration;
+        $values      = array();
+        foreach ($this->getOrdinals() as $ord) {
+            $values[] = $enumeration::getByOrdinal($ord)->getValue();
         }
         return $values;
     }
@@ -388,9 +387,10 @@ public function getValues()
      */
     public function getNames()
     {
-        $names = array();
-        foreach ($this->getEnumerators() as $enumerator) {
-            $names[] = $enumerator->getName();
+        $enumeration = $this->enumeration;
+        $names       = array();
+        foreach ($this->getOrdinals() as $ord) {
+            $names[] = $enumeration::getByOrdinal($ord)->getName();
         }
         return $names;
     }