Implemented Enum::getByName(), fixes #18

Author: marc-mabe

src/MabeEnum/Enum.php

@@ -141,6 +141,24 @@ final static public function get($value)
         return $instance;
     }
 
+    /**
+     * Get an enum by the given name
+     *
+     * @param string $name The name to instantiate the enum by
+     * @return Enum
+     * @throws InvalidArgumentException On an invalid or unknown name
+     * @throws LogicException           On ambiguous constant values
+     */
+    final public static function getByName($name)
+    {
+        $classConst = 'static::' . $name;
+        if (!defined($classConst)) {
+            $class = get_called_class();
+            throw new InvalidArgumentException($class . '::' . $name . ' not defined');
+        }
+        return static::get(constant($classConst));
+    }
+
     /**
      * Get an enum by the given ordinal number
      *
@@ -233,19 +251,14 @@ final static public function getConstants()
      * This will be called automatically on calling a method
      * with the same name of a defined constant.
      *
-     * @param string $const The name of the constant to instantiate the enum with
-     * @param array  $args  There should be no arguments
+     * @param string $method The name to instantiate the enum by (called as method)
+     * @param array  $args   There should be no arguments
      * @return Enum
-     * @throws BadMethodCallException On an unknown constant name (method name)
-     * @throws LogicException         On ambiguous constant values
+     * @throws InvalidArgumentException On an invalid or unknown name
+     * @throws LogicException           On ambiguous constant values
      */
-    final public static function __callStatic($const, array $args)
+    final public static function __callStatic($method, array $args)
     {
-        $classConst = 'static::' . $const;
-        if (!defined($classConst)) {
-            $class = get_called_class();
-            throw new BadMethodCallException($class . '::' . $const . ' not defined');
-        }
-        return static::get(constant($classConst));
+        return static::getByName($method);
     }
 }

tests/MabeEnumTest/EnumTest.php

@@ -72,19 +72,6 @@ public function testCallingGetOrdinalTwoTimesWillResultTheSameValue()
         $this->assertSame(1, $enum->getOrdinal());
     }
 
-    public function testInstantiateUsingMagicMethod()
-    {
-        $enum = EnumInheritance::ONE();
-        $this->assertInstanceOf('MabeEnumTest\TestAsset\EnumInheritance', $enum);
-        $this->assertSame(EnumInheritance::ONE, $enum->getValue());
-    }
-
-    public function testInstantiateUsingMagicMethodThrowsBadMethodCallException()
-    {
-        $this->setExpectedException('BadMethodCallException');
-        EnumInheritance::UNKNOWN();
-    }
-
     public function testInstantiateUsingOrdinalNumber()
     {
         $enum = EnumInheritance::getByOrdinal(2);
@@ -98,6 +85,26 @@ public function testInstantiateUsingInvalidOrdinalNumberThrowsInvalidArgumentExc
         EnumInheritance::getByOrdinal(3);
     }
 
+    public function testInstantiateByName()
+    {
+        $enum = EnumInheritance::getByName('ONE');
+        $this->assertInstanceOf('MabeEnumTest\TestAsset\EnumInheritance', $enum);
+        $this->assertSame(EnumInheritance::ONE, $enum->getValue());
+    }
+
+    public function testInstantiateByUnknownNameThrowsInvalidArgumentException()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        EnumInheritance::getByName('UNKNOWN');
+    }
+
+    public function testInstantiateUsingMagicMethod()
+    {
+        $enum = EnumInheritance::ONE();
+        $this->assertInstanceOf('MabeEnumTest\TestAsset\EnumInheritance', $enum);
+        $this->assertSame(EnumInheritance::ONE, $enum->getValue());
+    }
+
     public function testAmbuguousConstantsThrowsLogicException()
     {
         $this->setExpectedException('LogicException');