fixed bug in EnumMap::offsetGet() + more tests

Author: marc-mabe

src/EnumMap.php

@@ -148,7 +148,7 @@ public function offsetGet($enumerator)
     {
         $enumeration = $this->enumeration;
         $ord = $enumeration::get($enumerator)->getOrdinal();
-        if (!isset($this->map[$ord])) {
+        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
@@ -161,7 +161,7 @@ public function offsetGet($enumerator)
     /**
      * Attach a new enumerator or overwrite an existing one
      * @param Enum|null|boolean|int|float|string $enumerator
-     * @param mixed                              $data
+     * @param mixed                              $value
      * @return void
      * @throws InvalidArgumentException On an invalid given enumerator
      * @see attach()

tests/MabeEnumTest/EnumMapTest.php

@@ -8,6 +8,7 @@
 use MabeEnumTest\TestAsset\EnumInheritance;
 use OutOfBoundsException;
 use PHPUnit\Framework\TestCase;
+use UnexpectedValueException;
 
 /**
  * Unit tests for the class MabeEnum\EnumMap
@@ -98,6 +99,14 @@ public function testBasicWithEnumeratorValues()
         $this->assertSame([], $enumMap->getValues());
     }
 
+    public function testOffsetGetMissingKey()
+    {
+        $enumMap = new EnumMap(EnumBasic::class);
+
+        $this->expectException(UnexpectedValueException::class);
+        $enumMap->offsetGet(EnumBasic::ONE);
+    }
+
     public function testIterate()
     {
         $enumMap = new EnumMap(EnumBasic::class);
@@ -132,6 +141,7 @@ public function testIterate()
 
         // go to the next element (out of range)
         $this->assertNull($enumMap->next());
+        $this->assertNull($enumMap->current());
         $this->assertFalse($enumMap->valid());
         $this->assertSame(null, $enumMap->key());
 
@@ -243,6 +253,8 @@ public function testNullValue()
         $enumMap[EnumBasic::ONE()] = null;
 
         $this->assertSame(1, $enumMap->count());
+        $this->assertNull($enumMap[EnumBasic::ONE]);
+        $this->assertNull($enumMap->offsetGet(EnumBasic::ONE));
         $this->assertSame([EnumBasic::ONE()], $enumMap->getKeys());
 
         $enumMap->rewind();