Update Parameters and Dictionary toHttpValue implementation

Author: nyamsprod

composer.json

@@ -30,11 +30,11 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^v3.8.0",
         "httpwg/structured-field-tests": "*@dev",
-        "phpunit/phpunit": "^9.5.20",
         "phpstan/phpstan": "^1.5.4",
         "phpstan/phpstan-strict-rules": "^1.1",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-deprecation-rules": "^1.0"
+        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpunit/phpunit": "^9.5.20"
     },
     "autoload": {
         "psr-4": {
@@ -79,7 +79,7 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-develop": "1.0.x-dev"
+            "dev-develop": "1.x-dev"
         }
     }
 }

src/Dictionary.php

@@ -89,15 +89,12 @@ public static function fromHttpValue(string $httpValue): self
 
     public function toHttpValue(): string
     {
-        $returnValue = [];
-        foreach ($this->members as $key => $member) {
-            $returnValue[] = match (true) {
-                $member instanceof Item && true === $member->value => $key.$member->parameters->toHttpValue(),
-                default => $key.'='.$member->toHttpValue(),
-            };
-        }
+        $formatter = fn (Item|InnerList $member, string $key): string => match (true) {
+            $member instanceof Item && true === $member->value => $key.$member->parameters->toHttpValue(),
+            default => $key.'='.$member->toHttpValue(),
+        };
 
-        return implode(', ', $returnValue);
+        return implode(', ', array_map($formatter, $this->members, array_keys($this->members)));
     }
 
     public function count(): int

src/Parameters.php

@@ -136,20 +136,13 @@ public static function fromHttpValue(string $httpValue): self
      */
     public function toHttpValue(): string
     {
-        $returnValue = [];
-
-        foreach ($this->members as $key => $member) {
-            $value = ';'.$key;
-            $member = self::filterMember($member);
-
-            if ($member->value !== true) {
-                $value .= '='.$member->toHttpValue();
-            }
-
-            $returnValue[] = $value;
-        }
+        $formatter = fn (Item $member, string $key): string => match (true) {
+            !$member->parameters->isEmpty() => throw new ForbiddenStateError('Parameters instances can not contain parameterized Items.'),
+            true === $member->value => ';'.$key,
+            default => ';'.$key.'='.$member->toHttpValue(),
+        };
 
-        return implode('', $returnValue);
+        return implode('', array_map($formatter, $this->members, array_keys($this->members)));
     }
 
     public function count(): int