Micro-optimized Enum::by* functions

Author: marc-mabe

bench/EnumBench.php

@@ -50,9 +50,10 @@ class EnumBench
     public function init()
     {
         $enumRefl = new ReflectionClass(Enum::class);
-        $this->enumPropsRefl = $enumRefl->getProperties(ReflectionProperty::IS_STATIC);
-        foreach ($this->enumPropsRefl as $enumPropRefl) {
+        $enumPropsRefl = $enumRefl->getProperties(ReflectionProperty::IS_STATIC);
+        foreach ($enumPropsRefl as $enumPropRefl) {
             $enumPropRefl->setAccessible(true);
+            $this->enumPropsRefl[$enumPropRefl->getName()] = $enumPropRefl;
         }
 
         $this->names       = Enum66::getNames();
@@ -61,13 +62,18 @@ public function init()
         $this->enumerators = Enum66::getEnumerators();
     }
 
-    private function resetStaticEnumProps()
+    private function destructEnumerations()
     {
         foreach ($this->enumPropsRefl as $enumPropRefl) {
             $enumPropRefl->setValue([]);
         }
     }
 
+    private function destructEnumerationInstances()
+    {
+        $this->enumPropsRefl['instances']->setValue([]);
+    }
+
     public function benchGetName()
     {
         foreach ($this->enumerators as $enumerator) {
@@ -105,7 +111,7 @@ public function benchIsByValue()
 
     public function benchDetectConstants()
     {
-        $this->resetStaticEnumProps();
+        $this->destructEnumerations();
         Enum66::getConstants();
     }
 
@@ -136,20 +142,68 @@ public function benchByValue()
         }
     }
 
+    public function benchByValueAndInitialize()
+    {
+        foreach ($this->values as $value) {
+            $this->destructEnumerations();
+            Enum66::byValue($value);
+        }
+    }
+
+    public function benchByValueAndInstantiate()
+    {
+        $this->destructEnumerationInstances();
+        foreach ($this->values as $value) {
+            Enum66::byValue($value);
+        }
+    }
+
     public function benchByName()
     {
         foreach ($this->names as $name) {
             Enum66::byName($name);
         }
     }
 
+    public function benchByNameAndInitialize()
+    {
+        foreach ($this->names as $name) {
+            $this->destructEnumerations();
+            Enum66::byName($name);
+        }
+    }
+
+    public function benchByNameAndInstantiate()
+    {
+        $this->destructEnumerationInstances();
+        foreach ($this->names as $name) {
+            Enum66::byName($name);
+        }
+    }
+
     public function benchByOrdinal()
     {
         foreach ($this->ordinals as $ord) {
             Enum66::byOrdinal($ord);
         }
     }
 
+    public function benchByOrdinalAndInitialize()
+    {
+        foreach ($this->ordinals as $ord) {
+            $this->destructEnumerations();
+            Enum66::byOrdinal($ord);
+        }
+    }
+
+    public function benchByOrdinalAndInstantiate()
+    {
+        $this->destructEnumerationInstances();
+        foreach ($this->ordinals as $ord) {
+            Enum66::byOrdinal($ord);
+        }
+    }
+
     public function benchGetByValues()
     {
         foreach ($this->values as $value) {

src/Enum.php

@@ -188,8 +188,11 @@ final public static function get($enumerator)
      */
     final public static function byValue($value)
     {
-        $constants = self::detectConstants(static::class);
-        $name      = \array_search($value, $constants, true);
+        if (!isset(self::$names[static::class])) {
+            self::detectConstants(static::class);
+        }
+
+        $name = \array_search($value, self::$constants[static::class], true);
         if ($name === false) {
             throw new InvalidArgumentException(sprintf(
                 'Unknown value %s for enumeration %s',
@@ -201,7 +204,7 @@ final public static function byValue($value)
         }
 
         if (!isset(self::$instances[static::class][$name])) {
-            self::$instances[static::class][$name] = new static($constants[$name]);
+            self::$instances[static::class][$name] = new static(self::$constants[static::class][$name]);
         }
 
         return self::$instances[static::class][$name];
@@ -258,8 +261,7 @@ final public static function byOrdinal($ordinal)
             return self::$instances[static::class][$name];
         }
 
-        $const = static::class . '::' . $name;
-        return self::$instances[static::class][$name] = new static(\constant($const), $ordinal);
+        return self::$instances[static::class][$name] = new static(self::$constants[static::class][$name], $ordinal);
     }
 
     /**