Fixed getMembers method

Author: Petr Knap

src/Enum/AbstractEnum.php

@@ -39,8 +39,10 @@ abstract class AbstractEnum
      */
     protected function __construct($memberName)
     {
-        $this->memberName = $memberName;
-        $this->memberValue = $this->get($memberName);
+        if(!($memberName === null && !$this->exists(null))) {
+            $this->memberName = $memberName;
+            $this->memberValue = $this->get($memberName);
+        }
     }
 
     /**
@@ -98,7 +100,15 @@ protected static function setMembers(array $members)
      */
     public static function getMembers()
     {
-        return self::$members[get_called_class()];
+        $className = get_called_class();
+
+        $members = &self::$members[$className];
+
+        if(empty($members)) {
+            new $className(null);
+        }
+
+        return $members;
     }
 
     /**

tests/Enum/EnumTest.php

@@ -18,7 +18,9 @@ public function wrongKeyProvider()
     }
 
     /**
+     * @covers       EnumMock::__callStatic
      * @dataProvider goodKeyProvider
+     *
      * @param string $name
      * @param mixed $value
      */
@@ -33,7 +35,9 @@ public function testMagicConstruction_GoodKey($name, $value)
     }
 
     /**
+     * @covers       EnumMock::__callStatic
      * @dataProvider wrongKeyProvider
+     *
      * @param string $name
      */
     public function testMagicConstruction_WrongKey($name)
@@ -47,6 +51,9 @@ public function testMagicConstruction_WrongKey($name)
         EnumMock::$name();
     }
 
+    /**
+     * @covers EnumMock::__callStatic
+     */
     public function testComparable()
     {
         $this->assertSame(EnumMock::A(), EnumMock::A());
@@ -57,16 +64,18 @@ public function testComparable()
     }
 
     /**
-     * @dataProvider goodKeyProvider
-     * @param string $name
-     * @param mixed $value
+     * @covers EnumMock::getMembers
+     * @runInSeparateProcess
      */
-    public function testGetConstants($name, $value)
+    public function testGetMembers()
     {
-        $constants = EnumMock::getMembers();
+        $members = EnumMock::getMembers();
 
-        $this->assertInternalType("array", $constants);
-        $this->assertArrayHasKey($name, $constants);
-        $this->assertEquals($value, $constants[$name]);
+        $this->assertInternalType("array", $members);
+        $this->assertCount(2, $members);
+        $this->assertArrayHasKey("A", $members);
+        $this->assertEquals("a", $members["A"]);
+        $this->assertArrayHasKey("B", $members);
+        $this->assertEquals("b", $members["B"]);
     }
 }