Merge pull request #105 from marc-mabe/has-value-name

added Enum::hasValue() and Enum::hasName()

Author: marc-mabe

src/Enum.php

@@ -323,21 +323,43 @@ final public static function getConstants()
     }
 
     /**
-     * Is the given enumerator part of this enumeration
+     * Test if the given enumerator is part of this enumeration
      * 
      * @param static|null|bool|int|float|string $value
      * @return bool
      */
-    final public static function has($value)
+    final public static function has($enumerator)
     {
-        if ($value instanceof static && \get_class($value) === static::class) {
+        if ($enumerator instanceof static && \get_class($enumerator) === static::class) {
             return true;
         }
 
+        return static::hasValue($enumerator);
+    }
+
+    /**
+     * Test if the given enumerator value is part of this enumeration
+     *
+     * @param null|bool|int|float|string $value
+     * @return bool
+     */
+    final public static function hasValue($value)
+    {
         $constants = self::detectConstants(static::class);
         return \in_array($value, $constants, true);
     }
 
+    /**
+     * Test if the given enumerator name is part of this enumeration
+     *
+     * @param string $name
+     * @return bool
+     */
+    final public static function hasName($name)
+    {
+        return \is_string($name) && \defined("static::$name");
+    }
+
     /**
      * Detect all public available constants of given enumeration class
      *

tests/MabeEnumTest/EnumTest.php

@@ -386,15 +386,34 @@ public function testNotUnserializable()
     }
 
     public function testHas()
+    {
+        $this->assertFalse(EnumBasic::has('invalid'));
+        $this->assertFalse(EnumBasic::has(EnumInheritance::ONE()));
+        $this->assertTrue(EnumBasic::has(EnumBasic::ONE()));
+        $this->assertTrue(EnumBasic::has(EnumBasic::ONE));
+    }
+
+    public function testHasName()
+    {
+        $this->assertFalse(EnumBasic::hasName(''));
+        $this->assertFalse(EnumBasic::hasName(false));
+        $this->assertFalse(EnumBasic::hasName(true));
+        $this->assertFalse(EnumBasic::hasName('str'));
+        $this->assertFalse(EnumBasic::hasName(new \stdClass()));
+        $this->assertTrue(EnumBasic::hasName('ONE'));
+        $this->assertTrue(EnumBasic::hasName('STR'));
+    }
+
+    public function testHasValue()
     {
         $enum = EnumBasic::ONE();
 
-        $this->assertFalse($enum->has('invalid'));
-        $this->assertFalse($enum->has(EnumInheritance::ONE()));
-        $this->assertTrue($enum->has(EnumBasic::ONE()));
-        $this->assertTrue($enum->has(EnumBasic::ONE));
+        $this->assertFalse(EnumBasic::hasValue('invalid'));
+        $this->assertFalse(EnumBasic::hasValue(EnumInheritance::ONE()));
+        $this->assertFalse(EnumBasic::hasValue(EnumBasic::ONE()));
+        $this->assertTrue(EnumBasic::hasValue(EnumBasic::ONE));
     }
-    
+
     public function testConstVisibility()
     {
         if (PHP_VERSION_ID < 70100) {