Removing values() method and restoring toArray() method to a non-deprecated state

Author: danielcosta

src/Enum.php

@@ -39,7 +39,7 @@ abstract class Enum
      */
     public function __construct($value)
     {
-        if (!in_array($value, self::values())) {
+        if (!in_array($value, self::toArray())) {
             throw new \UnexpectedValueException("Value '$value' is not part of the enum " . get_called_class());
         }
 
@@ -79,15 +79,15 @@ public function __toString()
      */
     public static function keys()
     {
-        return array_keys(static::values());
+        return array_keys(static::toArray());
     }
 
     /**
      * Returns all possible values as an array
      *
      * @return array Constant name in key, constant value in value
      */
-    public static function values()
+    public static function toArray()
     {
         $class = get_called_class();
         if (!array_key_exists($class, self::$cache)) {
@@ -98,17 +98,6 @@ public static function values()
         return self::$cache[$class];
     }
 
-    /**
-     * An alias method for values()
-     *
-     * @return array
-     * @deprecated
-     */
-    public static function toArray()
-    {
-        return self::values();
-    }
-
     /**
      * Check if is valid enum value
      *
@@ -120,7 +109,7 @@ public static function toArray()
      */
     public static function isValid($value)
     {
-        return in_array($value, self::values());
+        return in_array($value, self::toArray());
     }
 
     /**
@@ -148,7 +137,7 @@ public static function isValidKey($key)
      */
     public static function search($value)
     {
-        return array_search($value, array_combine(self::keys(), self::values()));
+        return array_search($value, array_combine(self::keys(), self::toArray()));
     }
 
     /**

tests/EnumTest.php

@@ -94,11 +94,11 @@ public function testKeys()
     }
 
     /**
-     * values()
+     * toArray()
      */
-    public function testValues()
+    public function testToArray()
     {
-        $values = EnumFixture::values();
+        $values = EnumFixture::toArray();
         $this->assertInternalType("array", $values);
         $expectedValues = array(
             "FOO"    => EnumFixture::FOO,
@@ -108,14 +108,6 @@ public function testValues()
         $this->assertEquals($expectedValues, $values);
     }
 
-    /**
-     * toArray()
-     */
-    public function testToArray()
-    {
-        $this->assertEquals(EnumFixture::values(), EnumFixture::toArray());
-    }
-
     /**
      * __callStatic()
      */