Merge pull request #107 from marc-mabe/array-to-str

fixed array to string conversion in EnumMap::offsetGet()

Author: marc-mabe

src/EnumMap.php

@@ -148,11 +148,12 @@ public function offsetExists($enumerator)
     public function offsetGet($enumerator)
     {
         $enumeration = $this->enumeration;
-        $ord = $enumeration::get($enumerator)->getOrdinal();
+        $enumerator  = $enumeration::get($enumerator);
+        $ord = $enumerator->getOrdinal();
         if (!isset($this->map[$ord]) && !array_key_exists($ord, $this->map)) {
-            throw new UnexpectedValueException(\sprintf(
-                "Enumerator '%s' could not be found",
-                \is_object($enumerator) ? $enumerator->getValue() : $enumerator
+            throw new UnexpectedValueException(sprintf(
+                'Enumerator %s could not be found',
+                \var_export($enumerator->getValue(), true)
             ));
         }
 

tests/MabeEnumTest/EnumMapTest.php

@@ -107,6 +107,14 @@ public function testOffsetGetMissingKey()
         $enumMap->offsetGet(EnumBasic::ONE);
     }
 
+    public function testOffsetGetMissingArrayKey()
+    {
+        $enumMap = new EnumMap(EnumBasic::class);
+
+        $this->expectException(UnexpectedValueException::class);
+        $enumMap->offsetGet(EnumBasic::ARR);
+    }
+
     public function testIterate()
     {
         $enumMap = new EnumMap(EnumBasic::class);

tests/MabeEnumTest/EnumSetTest.php

@@ -451,7 +451,7 @@ public function testSetBinaryBitsetLeIntOutOfRangeBitsOfExtendedBytes1()
         $enumSet = new EnumSet(EnumBasic::class);
 
         $this->expectException(InvalidArgumentException::class, 'Out-Of-Range');
-        $enumSet->setBinaryBitsetLe("\x0A\xFF\x01");
+        $enumSet->setBinaryBitsetLe("\x0A\xFF\x02");
     }
 
     public function testSetBinaryBitsetLeIntOutOfRangeBitsOfExtendedBytes2()

tests/MabeEnumTest/EnumTest.php

@@ -90,12 +90,13 @@ public function testEnumInheritance()
             'EIGHT'         => 8,
             'NINE'          => 9,
             'ZERO'          => 0,
-            'FLOAT'         => 0.123,
-            'STR'           => 'str',
-            'STR_EMPTY'     => '',
-            'NIL'           => null,
-            'BOOLEAN_TRUE'  => true,
-            'BOOLEAN_FALSE' => false,
+            'ARR'           => EnumInheritance::ARR,
+            'FLOAT'         => EnumInheritance::FLOAT,
+            'STR'           => EnumInheritance::STR,
+            'STR_EMPTY'     => EnumInheritance::STR_EMPTY,
+            'NIL'           => EnumInheritance::NIL,
+            'BOOLEAN_TRUE'  => EnumInheritance::BOOLEAN_TRUE,
+            'BOOLEAN_FALSE' => EnumInheritance::BOOLEAN_FALSE,
             'INHERITANCE'   => 'Inheritance',
         ), EnumInheritance::getConstants());
 
@@ -105,7 +106,7 @@ public function testEnumInheritance()
 
         $enum = EnumInheritance::get(EnumInheritance::INHERITANCE);
         $this->assertSame(EnumInheritance::INHERITANCE, $enum->getValue());
-        $this->assertSame(16, $enum->getOrdinal());
+        $this->assertSame(17, $enum->getOrdinal());
     }
 
     public function testGetWithStrictValue()
@@ -279,15 +280,15 @@ public function testCallingGetOrdinalTwoTimesWillResultTheSameValue()
 
     public function testInstantiateUsingOrdinalNumber()
     {
-        $enum = EnumInheritance::byOrdinal(16);
-        $this->assertSame(16, $enum->getOrdinal());
+        $enum = EnumInheritance::byOrdinal(17);
+        $this->assertSame(17, $enum->getOrdinal());
         $this->assertSame('INHERITANCE', $enum->getName());
     }
 
     public function testInstantiateUsingInvalidOrdinalNumberThrowsInvalidArgumentException()
     {
         $this->expectException(InvalidArgumentException::class);
-        EnumInheritance::byOrdinal(17);
+        EnumInheritance::byOrdinal(18);
     }
 
     public function testInstantiateByName()

tests/MabeEnumTest/TestAsset/EnumBasic.php

@@ -41,6 +41,7 @@ class EnumBasic extends Enum
     const NINE  = 9;
     const ZERO  = 0;
 
+    const ARR           = [0, 0.1, 'str', null, true, false];
     const FLOAT         = 0.123;
     const STR           = 'str';
     const STR_EMPTY     = '';