Constants renamed to members

Author: Petr Knap

src/Enum/AbstractEnum.php

@@ -8,7 +8,7 @@
  * @author  Petr Knap <dev@petrknap.cz>
  * @since   2016-01-23
  * @package PetrKnap\Php\Enum
- * @version 0.2
+ * @version 0.3
  * @license https://github.com/petrknap/php-enum/blob/master/LICENSE MIT
  */
 abstract class AbstractEnum
@@ -21,36 +21,36 @@ abstract class AbstractEnum
     /**
      * @var mixed[][]
      */
-    private static $constants = [];
+    private static $members = [];
 
     /**
-     * @var mixed
+     * @var string
      */
-    private $constantName;
+    private $memberName;
 
     /**
      * @var mixed
      */
-    private $constantValue;
+    private $memberValue;
 
     /**
-     * @param mixed $constantName
+     * @param string $memberName
      * @throws EnumException
      */
-    protected function __construct($constantName)
+    protected function __construct($memberName)
     {
-        $this->constantName = $constantName;
-        $this->constantValue = $this->get($constantName);
+        $this->memberName = $memberName;
+        $this->memberValue = $this->get($memberName);
     }
 
     /**
      * Creates magical factories for easier access to enum
      *
-     * @param mixed $constantName enum key
+     * @param string $memberName enum key
      * @param array $args ignored
      * @return mixed
      */
-    public static function __callStatic($constantName, array $args)
+    public static function __callStatic($memberName, array $args)
     {
         $className = get_called_class();
 
@@ -60,10 +60,10 @@ public static function __callStatic($constantName, array $args)
             $instances = [];
         }
 
-        $instance = &$instances[$constantName];
+        $instance = &$instances[$memberName];
 
         if (!($instance instanceof $className)) {
-            $instance = new $className($constantName);
+            $instance = new $className($memberName);
         }
 
         return $instance;
@@ -74,60 +74,60 @@ public static function __callStatic($constantName, array $args)
      */
     public function getName()
     {
-        return $this->constantName;
+        return $this->memberName;
     }
 
     /**
      * @return mixed
      */
     public function getValue()
     {
-        return $this->constantValue;
+        return $this->memberValue;
     }
 
     /**
-     * @param mixed[] $constants
+     * @param mixed[] $members
      */
-    protected static function setConstants(array $constants)
+    protected static function setMembers(array $members)
     {
-        self::$constants[get_called_class()] = $constants;
+        self::$members[get_called_class()] = $members;
     }
 
     /**
      * @return mixed[]
      */
-    public static function getConstants()
+    public static function getMembers()
     {
-        return self::$constants[get_called_class()];
+        return self::$members[get_called_class()];
     }
 
     /**
-     * @param string $constantName
+     * @param string $memberName
      * @return bool
      */
-    private function exists($constantName)
+    private function exists($memberName)
     {
-        return array_key_exists($constantName, self::$constants[get_called_class()]);
+        return array_key_exists($memberName, self::$members[get_called_class()]);
     }
 
     /**
-     * @param string $constantName
+     * @param string $memberName
      * @return mixed
      * @throws EnumException
      */
-    private function get($constantName)
+    private function get($memberName)
     {
-        if (!$this->exists($constantName)) {
+        if (!$this->exists($memberName)) {
             throw new EnumException(
                 sprintf(
                     "%s does not exist in %s",
-                    $constantName,
+                    $memberName,
                     get_called_class()
                 ),
                 EnumException::OUT_OF_RANGE
             );
         }
 
-        return self::$constants[get_called_class()][$constantName];
+        return self::$members[get_called_class()][$memberName];
     }
 }

tests/Enum/EnumTest.php

@@ -63,7 +63,7 @@ public function testComparable()
      */
     public function testGetConstants($name, $value)
     {
-        $constants = EnumMock::getConstants();
+        $constants = EnumMock::getMembers();
 
         $this->assertInternalType("array", $constants);
         $this->assertArrayHasKey($name, $constants);

tests/Enum/EnumTest/EnumMock.php

@@ -10,14 +10,14 @@
  */
 class EnumMock extends AbstractEnum
 {
-    protected function __construct($key)
+    protected function __construct($memberName)
     {
-        self::setConstants([
+        self::setMembers([
             "A" => "a",
             "B" => "b"
         ]);
 
-        parent::__construct($key);
+        parent::__construct($memberName);
     }
 
     /**