Bugfix Token parsing on item context

Author: nyamsprod

CHANGELOG.md

@@ -14,6 +14,7 @@ All Notable changes to `bakame/http-strucured-fields` will be documented in this
 
 - `InnerList::fromHttpValue` accepts Optional White Spaces at the start of its textual representation.
 - `Parameters::fromHttpValue` accepts Optional White Spaces at the start of its textual representation.
+- `Item::fromHttpValue` bugfix parsing Token data type.
 
 ### Deprecated
 

Makefile

@@ -0,0 +1,21 @@
+# make install
+install:
+	@docker run --rm -it -v$(PWD):/app composer install
+
+# unit tests
+phpunit:
+	@docker run --rm -it -v$(PWD):/app --workdir=/app php:8.1-cli-alpine vendor/bin/phpunit --coverage-text
+
+# phpstan
+phpstan:
+	@docker run --rm -it -v$(PWD):/app --workdir=/app php:8.1-cli-alpine vendor/bin/phpstan analyse -l max -c phpstan.neon src --ansi
+
+# coding style fix
+phpcs:
+	@docker run --rm -it -v$(PWD):/app --workdir=/app php:8.1-cli-alpine vendor/bin/php-cs-fixer fix -vvv --allow-risky=yes
+
+# test
+test:
+	@docker run --rm -it -v$(PWD):/app --workdir=/app php:8.1-cli-alpine php ./test.php
+
+.PHONY: install phpunit phpstan phpcs test

autoload.php

@@ -13,4 +13,4 @@
     if (is_readable($file)) {
         require $file;
     }
-});
+});

src/Item.php

@@ -150,7 +150,9 @@ private static function parseToken(string $string): array
             $regexp .= '$';
         }
 
-        preg_match('/'.$regexp.'/i', $string, $found);
+        if (1 !== preg_match('/'.$regexp.'/i', $string, $found)) {
+            throw new SyntaxError("The HTTP textual representation `$string` for a Token contains invalid characters.");
+        }
 
         return [
             Token::fromString($found['token']),
@@ -193,7 +195,12 @@ private static function parseBytesSequence(string $string): array
      */
     private static function parseNumber(string $string): array
     {
-        if (1 !== preg_match('/^(?<number>-?\d+(?:\.\d+)?)(?:[^\d.]|$)/', $string, $found)) {
+        $regexp = '^(?<number>-?\d+(?:\.\d+)?)(?:[^\d.]|$)';
+        if (!str_contains($string, ';')) {
+            $regexp = '^(?<number>-?\d+(?:\.\d+)?)$';
+        }
+
+        if (1 !== preg_match('/'.$regexp.'/', $string, $found)) {
             throw new SyntaxError("The HTTP textual representation `$string` for a number contains invalid characters.");
         }
 

src/TokenTest.php

@@ -4,13 +4,12 @@
 
 namespace Bakame\Http\StructuredFields;
 
-use PHPUnit\Framework\TestCase;
 use function var_export;
 
 /**
  * @coversDefaultClass \Bakame\Http\StructuredFields\Token
  */
-final class TokenTest extends TestCase
+final class TokenTest extends StructuredFieldTest
 {
     /** @var array|string[] */
     protected array $paths = [