Improve DisplayString test coverage

Author: nyamsprod

.github/workflows/build.yml

@@ -48,8 +48,8 @@ jobs:
 
       - name: Run static analysis
         run: composer phpstan
-        if: ${{ matrix.php == '8.2' && matrix.stability == 'prefer-stable'}}
+        if: ${{ matrix.php == '8.3' && matrix.stability == 'prefer-stable'}}
 
       - name: Run Coding style rules
         run: composer phpcs:fix
-        if: ${{ matrix.php == '8.2' && matrix.stability == 'prefer-stable'}}
+        if: ${{ matrix.php == '8.3' && matrix.stability == 'prefer-stable'}}

src/DisplayString.php

@@ -46,12 +46,12 @@ public static function fromEncoded(Stringable|string $encodedValue): self
             return new self($value);
         }
 
-        if (1 === preg_match('/%(?![0-9a-fA-F]{2})/', $value)) {
+        if (1 === preg_match('/%(?![0-9a-f]{2})/', $value)) {
             throw new SyntaxError('The string '.$value.' contains invalid utf-8 encoded sequence.');
         }
 
         $value = (string) preg_replace_callback(
-            ',%[A-Fa-f0-9]{2},',
+            ',%[a-f0-9]{2},',
             fn (array $matches): string => rawurldecode($matches[0]),
             $value
         );

src/Parser.php

@@ -447,12 +447,11 @@ private static function extractDisplayString(string $httpValue): array
 
             $octet = substr($remainder, 0, 2);
             $offset += 2;
-            $remainder = substr($remainder, 2);
-
-            if (2 !== strlen($octet) || $octet !== strtolower($octet)) {
+            if (1 === preg_match('/^[0-9a-f]]{2}$/', $octet)) {
                 throw new SyntaxError("The HTTP textual representation '$httpValue' for a DisplayString contains uppercased percent encoding sequence.");
             }
 
+            $remainder = substr($remainder, 2);
             $output .= $char.$octet;
         }
 

tests/ItemTest.php

@@ -24,8 +24,6 @@ final class ItemTest extends StructuredFieldTestCase
         'number-generated.json',
         'string.json',
         'string-generated.json',
-        'token.json',
-        'token-generated.json',
         'item.json',
         'date.json',
     ];

tests/ParserTest.php

@@ -143,7 +143,7 @@ public function it_fails_to_parse_an_invalid_http_field_2(): void
 
     #[Test]
     #[DataProvider('provideHttpValueForDataType')]
-    public function it_parses_basic_data_type(string $httpValue, ByteSequence|Token|DateTimeImmutable|string|int|float|bool $expected): void
+    public function it_parses_basic_data_type(string $httpValue, ByteSequence|Token|DisplayString|DateTimeImmutable|string|int|float|bool $expected): void
     {
         $field = $this->parser->parseValue($httpValue);
         if (is_scalar($expected)) {
@@ -197,6 +197,11 @@ public static function provideHttpValueForDataType(): iterable
             'httpValue' => '?0',
             'expected' => false,
         ];
+
+        yield 'it parses a display string' => [
+            'httpValue' => '%"b%c3%a9b%c3%a9"',
+            'expected' => DisplayString::fromDecoded('bébé'),
+        ];
     }
 
     #[Test]
@@ -219,6 +224,9 @@ public static function provideInvalidHttpValueForDataType(): array
             ['@1_000_000_000_000.0'],
             ['-1_000_000_000_000.0'],
             ['      '],
+            ['%"b%c3%a9b%c3%a9'],
+            ['%b%c3%a9b%c3%a9"'],
+            ['%"b%C3%A9b%C3%A9"'],
         ];
     }
 }

tests/RecordAggregate.php

@@ -15,7 +15,14 @@
 
 /**
  * @implements IteratorAggregate<string, Record>
- * @phpstan-import-type RecordData from Record
+ * @phpstan-type RecordData array{
+ *      name: string,
+ *      header_type: 'dictionary'|'list'|'item',
+ *      raw: array<string>,
+ *      canonical?: array<string>,
+ *      must_fail?: bool,
+ *      can_fail?: bool
+ *  }
  */
 final class RecordAggregate implements IteratorAggregate
 {