Fixed an issue when calling Enum::option1() and then calling Enum::from('option2'), option2 was not registered.

Author: ekvedaras

CHANGELOG-1.x.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.1] - 2020-09-02
+### Fixed
+- There was an issue when calling `Enum::option1()` and then calling `Enum::from('option2')`, `option2` was not registered.
+
+### Updated
+- Use `static::clas` instead of `get_called_class()`
+- Use `static::$cache` instead of `self::$cache`
+
 ## [1.1.0] - 2020-08-31
 ### Added
 - `keyString` static method to fetch as string, glued by comma by default
@@ -18,7 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Array and illuminate collection implementations
 
-[Unreleased]:  https://github.com/ekvedaras/php-enum/compare/v1.1.0...HEAD
+[Unreleased]:  https://github.com/ekvedaras/php-enum/compare/v1.1.1...HEAD
+[1.1.1]:  https://github.com/ekvedaras/php-enum/compare/v1.1.0...v1.1.1
 [1.1.0]:  https://github.com/ekvedaras/php-enum/compare/v1.0.1...v1.1.0
 [1.0.1]:  https://github.com/ekvedaras/php-enum/compare/v1.0.0...v1.0.1
 [1.0.0]:  https://github.com/ekvedaras/php-enum/releases/tag/v1.0.0

src/BaseEnum.php

@@ -134,30 +134,38 @@ private static function getClassKey(): int
      * Static method which returns all available types
      *
      * @return static[]
-     * @noinspection PhpDocMissingThrowsInspection
      */
     public static function enum()
     {
         $classKey = static::getClassKey();
 
-        if (!isset(self::$cache)) {
-            self::$cache = static::getNewStorage();
+        if (!isset(static::$cache)) {
+            static::$cache = static::getNewStorage();
         }
 
-        if (!static::existsInStorage(self::$cache, $classKey)) {
-            $methods = static::getNewStorage();
+        if (!static::existsInStorage(static::$cache, $classKey)) {
+            static::build($classKey);
+        }
 
-            /** @noinspection PhpUnhandledExceptionInspection */
-            foreach ((new ReflectionClass(get_called_class()))->getMethods(ReflectionMethod::IS_FINAL) as $method) {
-                /** @var static $enum */
-                $enum = $method->invoke(null);
-                static::putToStorage($methods, $enum->id(), $enum);
-            }
+        return static::getFromStorage(static::$cache, $classKey);
+    }
+
+    /**
+     * Build instances of enum options
+     *
+     * @param int $classKey
+     */
+    protected static function build(int $classKey)
+    {
+        $methods = static::getNewStorage();
 
-            static::putToStorage(self::$cache, $classKey, $methods);
+        foreach ((new ReflectionClass(static::class))->getMethods(ReflectionMethod::IS_FINAL) as $method) {
+            /** @var static $enum */
+            $enum = $method->invoke(null);
+            static::putToStorage($methods, $enum->id(), $enum);
         }
 
-        return static::getFromStorage(self::$cache, $classKey);
+        static::putToStorage(static::$cache, $classKey, $methods);
     }
 
     /**
@@ -215,7 +223,6 @@ public static function __set_state(array $state): self
      * @param string|int  $id
      * @param string|null $name
      * @param null        $meta
-     * @noinspection PhpDocMissingThrowsInspection
      * @return static
      */
     protected static function get($id, string $name = null, $meta = null): self
@@ -226,19 +233,19 @@ protected static function get($id, string $name = null, $meta = null): self
 
         $classKey = static::getClassKey();
 
-        if (!isset(self::$cache)) {
-            self::$cache = static::getNewStorage();
+        if (!isset(static::$cache)) {
+            static::$cache = static::getNewStorage();
         }
 
-        if (!static::existsInStorage(self::$cache, $classKey)) {
-            static::putToStorage(self::$cache, $classKey, static::getNewStorage());
+        if (!static::existsInStorage(static::$cache, $classKey)) {
+            static::putToStorage(static::$cache, $classKey, static::getNewStorage());
+            static::build($classKey);
         }
 
-        $instances = static::getFromStorage(self::$cache, $classKey);
+        $instances = static::getFromStorage(static::$cache, $classKey);
 
         if (!static::existsInStorage($instances, $id)) {
-            /** @noinspection PhpUnhandledExceptionInspection */
-            $reflection = new ReflectionClass(get_called_class());
+            $reflection = new ReflectionClass(static::class);
             $instance   = $reflection->newInstanceWithoutConstructor();
 
             $refConstructor = $reflection->getConstructor();

tests/BaseEnumTest.php

@@ -49,6 +49,31 @@ public function enums(): array
         ];
     }
 
+    /**
+     * @test
+     * @dataProvider enums
+     * @param BaseEnum|PaymentStatusOptions|string $enum
+     */
+    public function it_does_not_crash_when_calling_from_for_yet_unregistered_id(string $enum)
+    {
+        $pendingKey  = self::PAYMENT_STATUS_PENDING;
+        $completedId = self::PAYMENT_STATUS_IDS[self::PAYMENT_STATUS_COMPLETED];
+
+        $this->assertInstanceOf($enum, $enum::$pendingKey());
+        $this->assertInstanceOf($enum, $enum::from($completedId));
+    }
+
+    /**
+     * @test
+     * @dataProvider enums
+     * @runInSeparateProcess
+     * @param BaseEnum|PaymentStatusOptions|string $enum
+     */
+    public function it_does_not_crash_when_calling_enum_first(string $enum)
+    {
+        $this->assertNotEmpty($enum::enum());
+    }
+
     /**
      * @test
      * @dataProvider enums