Merge pull request #79 from marc-mabe/deprecate_enum_clear

deprecated Enum::clear()

Author: marc-mabe

src/Enum.php

@@ -245,6 +245,7 @@ final public static function getByOrdinal($ordinal)
      * NOTE: This can break singleton behavior ... use it with caution!
      *
      * @return void
+     * @deprecated
      */
     final public static function clear()
     {

tests/MabeEnumTest/EnumSerializableTraitTest.php

@@ -4,6 +4,7 @@
 
 use MabeEnumTest\TestAsset\SerializableEnum;
 use PHPUnit_Framework_TestCase as TestCase;
+use ReflectionClass;
 
 /**
  * Unit tests for the trait MabeEnum\EnumSerializableTrait
@@ -16,11 +17,9 @@ class EnumSerializableTraitTest extends TestCase
 {
     public function setUp()
     {
-        if (version_compare(PHP_VERSION, '5.4', '<')) {
+        if (PHP_VERSION_ID < 50400) {
             $this->markTestSkipped('Traits require PHP-5.4');
         }
-
-        SerializableEnum::clear();
     }
 
     public function testSerializeSerializableEnum()
@@ -38,7 +37,7 @@ public function testUnserializeFirstWillHoldTheSameInstance()
         $this->assertInternalType('string', $serialized);
 
         // clear all instantiated instances so we can virtual test unserializing first
-        SerializableEnum::clear();
+        $this->clearEnumeration('MabeEnumTest\TestAsset\SerializableEnum');
 
         // First unserialize
         $unserialized = unserialize($serialized);
@@ -69,4 +68,23 @@ public function testUnserializeThrowsLogicExceptionOnChangingValue()
         $enum = SerializableEnum::get(SerializableEnum::INT);
         $enum->unserialize(serialize(SerializableEnum::STR));
     }
+
+    /**
+     * Clears all instantiated enumerations and detected constants of the given enumerator
+     * @param string $enumeration
+     */
+    private function clearEnumeration($enumeration)
+    {
+        $reflClass = new ReflectionClass($enumeration);
+        while ($reflClass->getName() !== 'MabeEnum\Enum') {
+            $reflClass = $reflClass->getParentClass();
+        }
+
+        $reflPropInstances = $reflClass->getProperty('instances');
+        $reflPropInstances->setAccessible(true);
+        $reflPropInstances->setValue(null, array());
+        $reflPropConstants = $reflClass->getProperty('constants');
+        $reflPropConstants->setAccessible(true);
+        $reflPropConstants->setValue(null, array());
+    }
 }

tests/MabeEnumTest/EnumTest.php

@@ -21,12 +21,6 @@
  */
 class EnumTest extends TestCase
 {
-    public function setUp()
-    {
-        EnumBasic::clear();
-        EnumInheritance::clear();
-    }
-
     public function testGetNameReturnsConstantNameOfCurrentValue()
     {
         $enum = EnumBasic::get(EnumBasic::ONE);