Improve TypedMap::unserializeKey() and test coverage

Author: vudaltsov

src/TypedMap.php

@@ -4,6 +4,8 @@
 
 namespace Typhoon\TypedMap;
 
+use function Typhoon\Formatter\format;
+
 /**
  * @api
  * @implements \ArrayAccess<Key, mixed>
@@ -147,9 +149,23 @@ public function __unserialize(array $data): void
 
     private static function unserializeKey(string $serializedKey): Key
     {
-        $key = unserialize($serializedKey);
-        \assert($key instanceof Key);
+        $key = @unserialize($serializedKey);
+
+        if ($key instanceof Key) {
+            return $key;
+        }
+
+        if ($key === false) {
+            throw new \LogicException(\sprintf(
+                'Failed to unserialize key `%s`',
+                format($serializedKey)
+            ));
+        }
 
-        return $key;
+        throw new \LogicException(\sprintf(
+            'Expected unserialized key to be an instance of `%s`, got: `%s`',
+            Key::class,
+            format($key),
+        ));
     }
 }

tests/OptionalKeys.php

@@ -5,7 +5,7 @@
 namespace Typhoon\TypedMap;
 
 /**
- * @implements OptionalKey<string>
+ * @implements OptionalKey<mixed>
  */
 enum OptionalKeys implements OptionalKey
 {

tests/TypedMapTest.php

@@ -66,7 +66,6 @@ public function testWithMapReturnsNewMapWithMergedKeys(): void
         self::assertNotSame($map2, $merged);
     }
 
-    public function testItRemovesKeyViaWithout(): void
     public function testWithoutCalledWithNoKeysReturnsSameMap(): void
     {
         $map = TypedMap::one(Keys::A, 123);
@@ -76,6 +75,7 @@ public function testWithoutCalledWithNoKeysReturnsSameMap(): void
         self::assertSame($map, $newMap);
     }
 
+    public function testWithoutReturnsNewMapWithoutKeys(): void
     {
         $map = TypedMap::one(Keys::A, 123);
         $initialMapCopy = clone $map;
@@ -107,6 +107,18 @@ public function testMapCount(): void
         self::assertCount(1, $map2);
     }
 
+    public function testToPairs(): void
+    {
+        $map = TypedMap::one(Keys::A, 1)->with(Keys::B, 'a');
+
+        $pairs = $map->toPairs();
+
+        self::assertEquals(
+            [new Pair(Keys::A, 1), new Pair(Keys::B, 'a')],
+            $pairs,
+        );
+    }
+
     public function testOffsetSetThrows(): void
     {
         $map = new TypedMap();
@@ -125,7 +137,7 @@ public function testOffsetUnsetThrows(): void
         unset($map[Keys::A]);
     }
 
-    public function testItDeserializesCorrectly(): void
+    public function testItUnserializesCorrectly(): void
     {
         $map = TypedMap::one(Keys::A, 'a')->with(Keys::B, new \stdClass());
 
@@ -143,4 +155,22 @@ public function testSerializedRepresentationDoesNotChange(): void
             serialize($map),
         );
     }
+
+    public function testUnserializeThrowsIfKeyIsNotUnserializable(): void
+    {
+        $map = new TypedMap();
+
+        $this->expectExceptionObject(new \LogicException("Failed to unserialize key `''`"));
+
+        $map->__unserialize(['' => 1]);
+    }
+
+    public function testUnserializeChecksKey(): void
+    {
+        $map = new TypedMap();
+
+        $this->expectExceptionObject(new \LogicException("Expected unserialized key to be an instance of `Typhoon\\TypedMap\\Key`, got: `''`"));
+
+        $map->__unserialize([serialize('') => 1]);
+    }
 }