Improve Token test suite

Author: nyamsprod

CHANGELOG.md

@@ -10,10 +10,11 @@ All Notable changes to `bakame/http-strucured-fields` will be documented in this
 
 ### Fixed
 
-- `Parser` no longer returns the `Item` instance
-- `Parser` improve internal Date generation
-- `Value` improve float serialization
+- `Parser` no longer instantiate an `Item` object
+- `Parser` internal Date generation simplified
+- `Value` float serialization simplified
 - `OuterList::fromHttpValue`, `InnerList::fromHttpValue`, `Dictionnary::fromHttpValue` rewritten to improve decoupling from `Parser`
+- Adding missing interoperability test for the `Token` type
 
 ### Deprecated
 

src/InnerList.php

@@ -92,8 +92,8 @@ public static function fromAssociative(iterable $value, iterable $parameters): s
     public static function fromPair(array $pair): self
     {
         return match (true) {
-            !array_is_list($pair) => throw new SyntaxError('The pair must be represented by an array as a list.'), /* @phpstan-ignore-line */
-            2 !== count($pair) => throw new SyntaxError('The pair first member must be the member list and the second member the inner list parameters.'), /* @phpstan-ignore-line */
+            !array_is_list($pair) => throw new SyntaxError('The pair must be represented by an array as a list.'), // @phpstan-ignore-line
+            2 !== count($pair) => throw new SyntaxError('The pair first member must be the member list and the second member the inner list parameters.'), // @phpstan-ignore-line
             default => new self($pair[0], !$pair[1] instanceof Parameters ? Parameters::fromPairs($pair[1]) : $pair[1]),
         };
     }

src/Item.php

@@ -79,8 +79,8 @@ public static function fromAssociative(DateTimeInterface|ByteSequence|Token|stri
     public static function fromPair(array $pair): self
     {
         return match (true) {
-            !array_is_list($pair) => throw new SyntaxError('The pair must be represented by an array as a list.'), /* @phpstan-ignore-line */
-            2 !== count($pair) => throw new SyntaxError('The pair first member is the item value; its second member is the item parameters.'), /* @phpstan-ignore-line */
+            !array_is_list($pair) => throw new SyntaxError('The pair must be represented by an array as a list.'), // @phpstan-ignore-line
+            2 !== count($pair) => throw new SyntaxError('The pair first member is the item value; its second member is the item parameters.'), // @phpstan-ignore-line
             default => new self(new Value($pair[0]), $pair[1] instanceof Parameters ? $pair[1] : Parameters::fromPairs($pair[1])),
         };
     }

src/ParametersTest.php

@@ -5,6 +5,7 @@
 namespace Bakame\Http\StructuredFields;
 
 use LogicException;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 
 final class ParametersTest extends StructuredFieldTestCase
@@ -63,11 +64,21 @@ public function it_fails_to_instantiate_with_an_item_containing_already_paramete
     }
 
     #[Test]
-    public function it_fails_to_instantiate_with_an_parameter_key_as_int(): void
+    #[DataProvider('invalidMapKeyProvider')]
+    public function it_fails_to_instantiate_with_a_parameter_and_an_invalid_key(string|int $key): void
     {
         $this->expectException(SyntaxError::class);
 
-        Parameters::fromAssociative([1 => Item::true()]); // @phpstan-ignore-line
+        Parameters::fromAssociative([$key => Item::true()]); // @phpstan-ignore-line
+    }
+
+    /**
+     * @return iterable<string,array{key:string|int}>
+     */
+    public static function invalidMapKeyProvider(): iterable
+    {
+        yield 'key is an integer' => ['key' => 42];
+        yield 'key start with an integer' => ['key' => '1b'];
     }
 
     #[Test]

src/TokenTest.php

@@ -6,10 +6,15 @@
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\TestCase;
 
-final class TokenTest extends TestCase
+final class TokenTest extends StructuredFieldTestCase
 {
+    /** @var array<string> */
+    protected static array $httpWgTestFilenames = [
+        'token.json',
+        'token-generated.json',
+    ];
+
     #[Test]
     #[DataProvider('invalidTokenString')]
     public function it_will_fail_on_invalid_token_string(string $httpValue): void

src/Type.php

@@ -37,7 +37,7 @@ public static function fromValue(ValueAccess|Token|ByteSequence|DateTimeInterfac
     public static function tryFromValue(mixed $value): self|null
     {
         try {
-            return self::fromValue($value); /* @phpstan-ignore-line */
+            return self::fromValue($value); // @phpstan-ignore-line
         } catch (Throwable) {
             return null;
         }

src/TypeTest.php

@@ -35,7 +35,7 @@ public function it_can_tell_the_item_type_from_a_value_instance(): void
     #[DataProvider('itemTypeProvider')]
     public function it_can_tell_the_item_type(mixed $value, Type $expectedType): void
     {
-        self::assertTrue($expectedType->equals(Type::fromValue($value))); /* @phpstan-ignore-line */
+        self::assertTrue($expectedType->equals(Type::fromValue($value))); // @phpstan-ignore-line
         self::assertTrue($expectedType->equals(Type::tryFromValue($value)));
     }