fixed method clear + tests, removed unused test enum

Author: marc-mabe

src/MabeEnum/Enum.php

@@ -144,12 +144,13 @@ static public function get($value)
      */
     final static function clear()
     {
-        $class = get_called_class();
+        $class  = get_called_class();
+        $length = strlen($class);
 
         // clear instantiated enums
-        foreach (self::$enums as $id => $enum) {
-            if (strcasecmp($class . '.', $id) === 0) {
-                unset(self::$enums[$id]);
+        foreach (self::$instances as $id => $enum) {
+            if (strncasecmp($class . '.', $id, $length) === 0) {
+                unset(self::$instances[$id]);
             }
         }
 
@@ -181,10 +182,9 @@ final static public function getConstants()
         if (count($constants) > count(array_unique($constants))) {
             $ambiguous = array();
             foreach (array_count_values($constants) as $constValue => $countValue) {
-                if ($countValue < 2) {
-                    continue;
+                if ($countValue > 1) {
+                    $ambiguous[] = $constValue;
                 }
-                $ambiguous[] = $constValue;
             }
             throw new LogicException(sprintf(
                 'All possible values needs to be unique. The following are ambiguous: %s',

tests/MabeEnumTest/EnumTest.php

@@ -66,21 +66,13 @@ public function testCallingGetOrdinalTwoTimesWillResultTheSameValue()
 
     public function testInstantiateUsingMagicMethod()
     {
-        if (version_compare(PHP_VERSION, '5.3', '<')) {
-            $this->markTestSkipped("Instantiating using magic method doesn't work for PHP < 5.3");
-        }
-
         $enum = MabeEnumTest_TestAsset_EnumInheritance::ONE();
         $this->assertInstanceOf('MabeEnumTest_TestAsset_EnumInheritance', $enum);
         $this->assertSame(MabeEnumTest_TestAsset_EnumInheritance::ONE, $enum->getValue());
     }
 
     public function testInstantiateUsingMagicMethodThrowsBadMethodCallException()
     {
-        if (version_compare(PHP_VERSION, '5.3', '<')) {
-            $this->markTestSkipped("Instantiating using magic method doesn't work for PHP < 5.3");
-        }
-
         $this->setExpectedException('BadMethodCallException');
         MabeEnumTest_TestAsset_EnumInheritance::UNKNOWN();
     }
@@ -90,4 +82,22 @@ public function testAmbuguousConstantsThrowsLogicException()
         $this->setExpectedException('LogicException');
         MabeEnumTest_TestAsset_EnumAmbiguous::get(MabeEnumTest_TestAsset_EnumAmbiguous::AMBIGUOUS1);
     }
+
+    public function testSingleton()
+    {
+        $enum1 = MabeEnumTest_TestAsset_EnumWithoutDefaultValue::get(MabeEnumTest_TestAsset_EnumWithoutDefaultValue::ONE);
+        $enum2 = MabeEnumTest_TestAsset_EnumWithoutDefaultValue::ONE();
+        $this->assertSame($enum1, $enum2);
+    }
+
+    public function testClear()
+    {
+        $enum1 = MabeEnumTest_TestAsset_EnumWithoutDefaultValue::ONE();
+        MabeEnumTest_TestAsset_EnumWithoutDefaultValue::clear();
+        $enum2 = MabeEnumTest_TestAsset_EnumWithoutDefaultValue::ONE();
+        $enum3 = MabeEnumTest_TestAsset_EnumWithoutDefaultValue::ONE();
+        
+        $this->assertNotSame($enum1, $enum2);
+        $this->assertSame($enum2, $enum3);
+    }
 }