Improve Container constraints

Author: nyamsprod

CHANGELOG.md

@@ -23,6 +23,8 @@ All Notable changes to `bakame/http-strucured-fields` will be documented in this
 - `Value` internal class to improve Item public API;
 - **[BC Break]** `::fromAssociative` and `::fromPair` the `$parameters` argument is now required;
 - **[BC Break]** `MemberOrderedMap` instances can no longer be added to `Dictionary` or `OuterList` instances.
+- RFC restriction on eligible container members.
+- Exception normalization.
 
 ### Deprecated
 

src/Dictionary.php

@@ -53,7 +53,8 @@ private static function filterMember(mixed $member): object
     {
         return match (true) {
             $member instanceof ParameterAccess && ($member instanceof MemberList || $member instanceof ValueAccess) => $member,
-            $member instanceof MemberOrderedMap => throw new InvalidArgument('Only structured fields as list are supported.'),
+            !$member instanceof ParameterAccess && ($member instanceof MemberList || $member instanceof ValueAccess),
+            $member instanceof MemberOrderedMap => throw new InvalidArgument('An instance of "'.$member::class.'" can not be a member of "'.self::class.'".'),
             is_iterable($member) => InnerList::new(...$member),
             default => Item::new($member),
         };

src/InnerList.php

@@ -46,8 +46,8 @@ private static function filterMember(mixed $member): object
     {
         return match (true) {
             $member instanceof ValueAccess && $member instanceof ParameterAccess => $member,
-            !$member instanceof StructuredField => Item::new($member),
-            default => throw new InvalidArgument('Expecting a "'.ValueAccess::class.'" instance; received a "'.$member::class.'" instead.'),
+            $member instanceof StructuredField => throw new InvalidArgument('An instance of "'.$member::class.'" can not be a member of "'.self::class.'".'),
+            default => Item::new($member),
         };
     }
 

src/OuterList.php

@@ -47,7 +47,8 @@ private static function filterMember(mixed $member): object
     {
         return match (true) {
             $member instanceof ParameterAccess && ($member instanceof MemberList || $member instanceof ValueAccess) => $member,
-            $member instanceof MemberOrderedMap => throw new InvalidArgument('Only structured fields as list are supported.'),
+            !$member instanceof ParameterAccess && ($member instanceof MemberList || $member instanceof ValueAccess),
+            $member instanceof MemberOrderedMap => throw new InvalidArgument('An instance of "'.$member::class.'" can not be a member of "'.self::class.'".'),
             is_iterable($member) => InnerList::new(...$member),
             default => Item::new($member),
         };

src/Parameters.php

@@ -50,10 +50,13 @@ private function __construct(iterable $members = [])
      */
     private static function filterMember(mixed $member): object
     {
+        $isItem = $member instanceof ValueAccess && $member instanceof ParameterAccess;
+
         return match (true) {
-            $member instanceof ValueAccess && $member instanceof ParameterAccess && $member->parameters()->hasNoMembers() => $member,
-            !$member instanceof StructuredField => Item::new($member),
-            default => throw new InvalidArgument('Parameters instances can only contain bare items.'),
+            $isItem && $member->parameters()->hasNoMembers() => $member,
+            $isItem && $member->parameters()->hasMembers() => throw new InvalidArgument('The instance of "'.$member::class.'" is not a Bare Item instance.'),
+            $member instanceof StructuredField => throw new InvalidArgument('An instance of "'.$member::class.'" can not be a member of "'.self::class.'".'),
+            default => Item::new($member),
         };
     }
 

src/TypeTest.php

@@ -15,7 +15,7 @@ final class TypeTest extends TestCase
     #[Test]
     public function it_will_throw_if_the_type_is_no_supported(): void
     {
-        $this->expectException(SyntaxError::class);
+        $this->expectException(InvalidArgument::class);
 
         Type::fromValue([]);
     }

src/Value.php

@@ -31,7 +31,7 @@ public function __construct(mixed $value)
             is_float($value) => [self::filterDecimal($value), Type::Decimal],
             is_bool($value) => [$value, Type::Boolean],
             is_string($value) => [self::filterString($value), Type::String],
-            default => throw new SyntaxError('The type "'.(is_object($value) ? $value::class : gettype($value)).'" is not supported.')
+            default => throw new InvalidArgument('The type "'.(is_object($value) ? $value::class : gettype($value)).'" is not supported.')
         };
     }