EnumMap::seek() throws TypeError in case of wrong argument type

Author: marc-mabe

src/Enum.php

@@ -365,7 +365,7 @@ private static function detectConstants(string $class): array
     {
         if (!isset(self::$constants[$class])) {
             $reflection = new ReflectionClass($class);
-            $allConstants  = [];
+            $constants  = [];
 
             do {
                 $scopeConstants = [];
@@ -376,16 +376,16 @@ private static function detectConstants(string $class): array
                     }
                 }
 
-                $allConstants = $scopeConstants + $allConstants;
+                $constants = $scopeConstants + $constants;
             } while (($reflection = $reflection->getParentClass()) && $reflection->name !== __CLASS__);
 
             assert(
-                self::noAmbiguousValues($allConstants),
+                self::noAmbiguousValues($constants),
                 "Ambiguous enumerator values detected for {$class}"
             );
 
-            self::$constants[$class] = $allConstants;
-            self::$names[$class] = \array_keys($allConstants);
+            self::$constants[$class] = $constants;
+            self::$names[$class] = \array_keys($constants);
         }
 
         return self::$constants[$class];

src/EnumMap.php

@@ -9,6 +9,7 @@
 use InvalidArgumentException;
 use OutOfBoundsException;
 use SeekableIterator;
+use TypeError;
 use UnexpectedValueException;
 
 /**
@@ -53,7 +54,8 @@ public function __construct(string $enumeration)
     {
         if (!\is_subclass_of($enumeration, Enum::class)) {
             throw new InvalidArgumentException(\sprintf(
-                "This EnumMap can handle subclasses of '%s' only",
+                '%s can handle subclasses of %s only',
+                 __CLASS__,
                 Enum::class
             ));
         }
@@ -199,7 +201,14 @@ public function offsetUnset($enumerator): void
      */
     public function seek($pos): void
     {
-        $pos = (int)$pos;
+        if (!is_int($pos)) {
+            throw new TypeError(\sprintf(
+                'Argument 1 passed to %s() must be of the type int, %s given',
+                __METHOD__,
+                gettype($pos)
+            ));
+        }
+
         if (!isset($this->ordinals[$pos])) {
             throw new OutOfBoundsException("Position {$pos} not found");
         }

src/EnumSerializableTrait.php

@@ -70,7 +70,6 @@ public function unserialize($serialized)
                 self::$instances[$class][$name] = $enumerator;
             }
         };
-        $closure = $closure->bindTo($this, Enum::class);
-        $closure();
+        $closure->bindTo($this, Enum::class)();
     }
 }

src/EnumSet.php

@@ -69,8 +69,8 @@ public function __construct(string $enumeration)
     {
         if (!\is_subclass_of($enumeration, Enum::class)) {
             throw new InvalidArgumentException(\sprintf(
-                "%s can handle subclasses of '%s' only",
-                static::class,
+                '%s can handle subclasses of %s only',
+                __METHOD__,
                 Enum::class
             ));
         }
@@ -301,7 +301,7 @@ private function doCountInt(): int
 
         // PHP does not support right shift unsigned
         if ($bitset < 0) {
-            $count = 1;
+            $count  = 1;
             $bitset = $bitset & \PHP_INT_MAX;
         }
 

tests/MabeEnumTest/EnumMapTest.php

@@ -319,6 +319,18 @@ public function testSeek()
         $enumMap->seek(2);
     }
 
+    public function testSeekThrowsTypeError()
+    {
+        $enumMap = new EnumMap(EnumBasic::class);
+
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage(
+            'Argument 1 passed to ' . EnumMap::class . '::seek() must be of the type int, string given'
+        );
+
+        $enumMap->seek('0');
+    }
+
     public function testSerializable()
     {
         $enumMap = new EnumMap(EnumBasic::class);