replaced internal method Enum[Set|Map]::initEnum() by Enum::get() since this does the same and is a little bit faster

Author: marc-mabe

src/MabeEnum/EnumMap.php

@@ -123,7 +123,6 @@ public function setFlags($flags)
         } elseif (!$keyFlag) {
             $keyFlag = $this->flags & 7;
         }
-        
 
         $currentFlag = $flags & 56;
         if ($currentFlag > 40) {
@@ -155,7 +154,8 @@ public function getFlags()
      */
     public function attach($enum, $data = null)
     {
-        parent::attach($this->initEnum($enum), $data);
+        $enumClass = $this->enumClass;
+        parent::attach($enumClass::get($enum), $data);
     }
 
     /**
@@ -166,7 +166,8 @@ public function attach($enum, $data = null)
     public function contains($enum)
     {
         try {
-            return parent::contains($this->initEnum($enum));
+            $enumClass = $this->enumClass;
+            return parent::contains($enumClass::get($enum));
         } catch (InvalidArgumentException $e) {
             // On an InvalidArgumentException the given argument can't be contained in this map
             return false;
@@ -181,7 +182,8 @@ public function contains($enum)
      */
     public function detach($enum)
     {
-        parent::detach($this->initEnum($enum));
+        $enumClass = $this->enumClass;
+        parent::detach($enumClass::get($enum));
     }
 
     /**
@@ -193,7 +195,8 @@ public function detach($enum)
     public function getHash($enum)
     {
         // getHash is available since PHP 5.4
-        return spl_object_hash($this->initEnum($enum));
+        $enumClass = $this->enumClass;
+        return spl_object_hash($enumClass::get($enum));
     }
 
     /**
@@ -215,7 +218,8 @@ public function offsetExists($enum)
      */
     public function offsetGet($enum)
     {
-        return parent::offsetGet($this->initEnum($enum));
+        $enumClass = $this->enumClass;
+        return parent::offsetGet($enumClass::get($enum));
     }
 
     /**
@@ -228,7 +232,8 @@ public function offsetGet($enum)
      */
     public function offsetSet($enum, $data = null)
     {
-        parent::offsetSet($this->initEnum($enum), $data);
+        $enumClass = $this->enumClass;
+        parent::offsetSet($enumClass::get($enum), $data);
     }
 
     /**
@@ -240,7 +245,8 @@ public function offsetSet($enum, $data = null)
      */
     public function offsetUnset($enum)
     {
-        parent::offsetUnset($this->initEnum($enum));
+        $enumClass = $this->enumClass;
+        parent::offsetUnset($enumClass::get($enum));
     }
 
     /**
@@ -286,32 +292,4 @@ public function key()
                 throw new RuntimeException('Invalid key flag');
         }
     }
-
-    /**
-     * Initialize an enumeration
-     * @param Enum|null|boolean|int|float|string $enum
-     * @return Enum
-     * @throws InvalidArgumentException On an invalid given enum
-     */
-    private function initEnum($enum)
-    {
-        // auto instantiate
-        if (is_scalar($enum)) {
-            $enumClass = $this->enumClass;
-            return $enumClass::get($enum);
-        }
-
-        // allow only enums of the same type
-        // (don't allow instance of)
-        $enumClass = get_class($enum);
-        if ($enumClass && strcasecmp($enumClass, $this->enumClass) === 0) {
-            return $enum;
-        }
-
-        throw new InvalidArgumentException(sprintf(
-            "The given enum of type '%s' isn't same as the required type '%s'",
-            get_class($enum) ?: gettype($enum),
-            $this->enumClass
-        ));
-    }
 }

src/MabeEnum/EnumSet.php

@@ -93,8 +93,8 @@ public function getFlags()
      */
     public function attach($enum)
     {
-        $enum    = $this->initEnum($enum);
-        $ordinal = $enum->getOrdinal();
+        $enumClass = $this->enumClass;
+        $ordinal   = $enumClass::get($enum)->getOrdinal();
 
         if (!($this->flags & self::UNIQUE) || !in_array($ordinal, $this->list, true)) {
             $this->list[] = $ordinal;
@@ -112,8 +112,8 @@ public function attach($enum)
      */
     public function contains($enum)
     {
-        $enum = $this->initEnum($enum);
-        return in_array($enum->getOrdinal(), $this->list, true);
+        $enumClass = $this->enumClass;
+        return in_array($enumClass::get($enum)->getOrdinal(), $this->list, true);
     }
 
     /**
@@ -124,9 +124,10 @@ public function contains($enum)
      */
     public function detach($enum)
     {
-        $enum = $this->initEnum($enum);
+        $enumClass = $this->enumClass;
+        $ordinal   = $enumClass::get($enum)->getOrdinal();
 
-        while (($index = array_search($enum->getOrdinal(), $this->list, true)) !== false) {
+        while (($index = array_search($ordinal, $this->list, true)) !== false) {
             unset($this->list[$index]);
         }
 
@@ -180,32 +181,4 @@ public function count()
     {
         return count($this->list);
     }
-
-    /**
-     * Initialize an enumeration
-     * @param Enum|null|boolean|int|float|string $enum
-     * @return Enum
-     * @throws InvalidArgumentException On an invalid given enum
-     */
-    private function initEnum($enum)
-    {
-        // auto instantiate
-        if (is_scalar($enum)) {
-            $enumClass = $this->enumClass;
-            return $enumClass::get($enum);
-        }
-
-        // allow only enums of the same type
-        // (don't allow instance of)
-        $enumClass = get_class($enum);
-        if ($enumClass && strcasecmp($enumClass, $this->enumClass) === 0) {
-            return $enum;
-        }
-
-        throw new InvalidArgumentException(sprintf(
-            "The given enum of type '%s' isn't same as the required type '%s'",
-            get_class($enum) ?: gettype($enum),
-            $this->enumClass
-        ));
-    }
 }