Fix ability to create invalid enums. Fixes #9

Author: mirfilip

src/Enum.php

@@ -40,7 +40,7 @@ abstract class Enum
      */
     public function __construct($value)
     {
-        if (!in_array($value, self::toArray())) {
+        if (!$this->isValid($value)) {
             throw new \UnexpectedValueException("Value '$value' is not part of the enum " . get_called_class());
         }
 
@@ -95,7 +95,6 @@ public static function toArray()
             $reflection = new \ReflectionClass($class);
             self::$cache[$class] = $reflection->getConstants();
         }
-
         return self::$cache[$class];
     }
 
@@ -107,7 +106,7 @@ public static function toArray()
      */
     public static function isValid($value)
     {
-        return in_array($value, self::toArray());
+        return in_array($value, self::toArray(), true);
     }
 
     /**
@@ -119,7 +118,7 @@ public static function isValid($value)
      */
     public static function isValidKey($key)
     {
-        return in_array($key, self::keys());
+        return in_array($key, self::keys(), true);
     }
 
     /**
@@ -131,7 +130,8 @@ public static function isValidKey($key)
      */
     public static function search($value)
     {
-        return array_search($value, array_combine(self::keys(), self::toArray()));
+        // TODO: Replace combine with self::toArray()
+        return array_search($value, array_combine(self::keys(), self::toArray()), true);
     }
 
     /**

tests/EnumFixture.php

@@ -15,11 +15,25 @@
  * @method static EnumFixture BAR()
  * @method static EnumFixture NUMBER()
  *
- * @author Daniel Costa <[email protected]
+ * @method static EnumFixture PROBLEMATIC_NUMBER()
+ * @method static EnumFixture PROBLEMATIC_NULL()
+ * @method static EnumFixture PROBLEMATIC_EMPTY_STRING()
+ * @method static EnumFixture PROBLEMATIC_BOOLEAN_FALSE()
+ *
+ * @author Daniel Costa <[email protected]>
+ * @author Mirosław Filip <[email protected]>
  */
 class EnumFixture extends Enum
 {
     const FOO = "foo";
     const BAR = "bar";
     const NUMBER = 42;
+
+    /**
+     * Values that are known to cause problems when used with soft typing
+     */
+    const PROBLEMATIC_NUMBER = 0;
+    const PROBLEMATIC_NULL = null;
+    const PROBLEMATIC_EMPTY_STRING = '';
+    const PROBLEMATIC_BOOLEAN_FALSE = false;
 }

tests/EnumTest.php

@@ -59,7 +59,6 @@ public function invalidValueProvider() {
         return [
             "string" => ['test'],
             "int" => [1234],
-            "null" => [null],
         ];
     }
 
@@ -86,13 +85,17 @@ public function toStringProvider() {
     public function testKeys()
     {
         $values = EnumFixture::keys();
-        $this->assertInternalType("array", $values);
         $expectedValues = array(
             "FOO",
             "BAR",
             "NUMBER",
+            "PROBLEMATIC_NUMBER",
+            "PROBLEMATIC_NULL",
+            "PROBLEMATIC_EMPTY_STRING",
+            "PROBLEMATIC_BOOLEAN_FALSE",
         );
-        $this->assertEquals($expectedValues, $values);
+
+        $this->assertSame($expectedValues, $values);
     }
 
     /**
@@ -101,13 +104,17 @@ public function testKeys()
     public function testToArray()
     {
         $values = EnumFixture::toArray();
-        $this->assertInternalType("array", $values);
         $expectedValues = array(
-            "FOO"    => EnumFixture::FOO,
-            "BAR"    => EnumFixture::BAR,
-            "NUMBER" => EnumFixture::NUMBER,
+            "FOO"                   => EnumFixture::FOO,
+            "BAR"                   => EnumFixture::BAR,
+            "NUMBER"                => EnumFixture::NUMBER,
+            "PROBLEMATIC_NUMBER"    => EnumFixture::PROBLEMATIC_NUMBER,
+            "PROBLEMATIC_NULL"      => EnumFixture::PROBLEMATIC_NULL,
+            "PROBLEMATIC_EMPTY_STRING"    => EnumFixture::PROBLEMATIC_EMPTY_STRING,
+            "PROBLEMATIC_BOOLEAN_FALSE"    => EnumFixture::PROBLEMATIC_BOOLEAN_FALSE,
         );
-        $this->assertEquals($expectedValues, $values);
+
+        $this->assertSame($expectedValues, $values);
     }
 
     /**
@@ -132,11 +139,29 @@ public function testBadStaticAccess()
 
     /**
      * isValid()
+     * @dataProvider isValidProvider
      */
-    public function testIsValid()
+    public function testIsValid($value, $isValid)
     {
-        $this->assertTrue(EnumFixture::isValid('foo'));
-        $this->assertFalse(EnumFixture::isValid('baz'));
+        $this->assertSame($isValid, EnumFixture::isValid($value));
+    }
+
+    public function isValidProvider() {
+        return [
+            /**
+             * Valid values
+             */
+            ['foo', true],
+            [42, true],
+            [null, true],
+            [0, true],
+            ['', true],
+            [false, true],
+            /**
+             * Invalid values
+             */
+            ['baz', false]
+        ];
     }
 
     /**
@@ -154,6 +179,9 @@ public function testIsValidKey()
     public function testSearch()
     {
         $this->assertEquals('FOO', EnumFixture::search('foo'));
-        $this->assertNotEquals('FOO', EnumFixture::isValidKey('baz'));
+        /**
+         * @see https://github.com/myclabs/php-enum/issues/9
+         */
+        $this->assertEquals(EnumFixture::PROBLEMATIC_NUMBER, EnumFixture::search(1));
     }
 }