Bugfix Value type detection

Author: nyamsprod

src/Type.php

@@ -58,35 +58,15 @@ public static function tryFromVariable(mixed $variable): self|null
             is_int($variable) => Type::Integer,
             is_float($variable) => Type::Decimal,
             is_bool($variable) => Type::Boolean,
-            is_string($variable) => match (true) {
-                null !== Token::tryFromString($variable) => Type::Token,
-                null !== ByteSequence::tryFromEncoded($variable) => Type::ByteSequence,
-                1 === preg_match('/[^\x20-\x7f]/', $variable) => Type::DisplayString,
-                default => Type::String,
-            },
+            is_string($variable) && 1 !== preg_match('/[^\x20-\x7f]/', $variable) => Type::String,
             default => null,
         };
     }
 
-    /**
-     * @deprecated since version 1.2.0 will be removed in the next major release.
-     * @see Type::fromVariable()
-     * @codeCoverageIgnore
-     *
-     * @throws InvalidArgument if the value can not be resolved into a supported HTTP structured field data type
-     */
-    public static function fromValue(mixed $value): self
+    public function assert(mixed $value): bool
     {
-        return self::fromVariable($value);
-    }
+        $new = self::tryFromVariable($value);
 
-    /**
-     * @deprecated since version 1.2.0 will be removed in the next major release.
-     * @see Type::tryFromVariable()
-     * @codeCoverageIgnore
-     */
-    public static function tryFromValue(mixed $value): self|null
-    {
-        return self::tryFromVariable($value);
+        return null !== $new && $new->equals($this);
     }
 }

src/Value.php

@@ -39,20 +39,19 @@ final class Value
      */
     public function __construct(mixed $value)
     {
-        $this->value = match (true) {
-            $value instanceof Item => $value->value(),
+        [$this->value, $this->type] = match (true) {
+            $value instanceof Item => [$value->value(), $value->type()],
             $value instanceof Token,
             $value instanceof ByteSequence,
-            $value instanceof DisplayString,
+            $value instanceof DisplayString => [$value, $value->type()],
             false === $value,
-            $value => $value,
-            $value instanceof DateTimeInterface => self::filterDate($value),
-            is_int($value) => self::filterIntegerRange($value, 'Integer'),
-            is_float($value) => self::filterDecimal($value),
-            is_string($value) => self::filterString($value),
+            $value => [$value, Type::Boolean],
+            $value instanceof DateTimeInterface => [self::filterDate($value), Type::Date],
+            is_int($value) => [self::filterIntegerRange($value, 'Integer'), Type::Integer],
+            is_float($value) => [self::filterDecimal($value), Type::Decimal],
+            is_string($value) => [self::filterString($value), Type::String],
             default => throw new ValueError('Unknown or unsupported type.')
         };
-        $this->type = Type::fromVariable($this->value);
     }
 
     /**

tests/IetfTest.php

@@ -45,7 +45,7 @@ public static function variableRfc8941Provider(): Iterator
         ];
 
         yield 'token' => [
-            'value' => 'application/xml',
+            'value' => Token::fromString('application/xml'),
             'expectedRfc8941' => true,
             'expectedRfc9651' => true,
         ];
@@ -57,13 +57,13 @@ public static function variableRfc8941Provider(): Iterator
         ];
 
         yield 'bytesequence' => [
-            'value' => 'cHJldGVuZCB0aGlzIGlzIGJpbmFyeSBjb250ZW50Lg==',
+            'value' => ByteSequence::fromEncoded('cHJldGVuZCB0aGlzIGlzIGJpbmFyeSBjb250ZW50Lg=='),
             'expectedRfc8941' => true,
             'expectedRfc9651' => true,
         ];
 
         yield 'displaystring' => [
-            'value' => 'bébé',
+            'value' => DisplayString::fromDecoded('bébé'),
             'expectedRfc8941' => false,
             'expectedRfc9651' => true,
         ];

tests/ItemTest.php

@@ -283,7 +283,7 @@ public static function itemTypeProvider(): iterable
             ],
             'string' => [
                 'item' => Item::new('42'),
-                'expectedType' => Type::ByteSequence,
+                'expectedType' => Type::String,
             ],
             'display string' => [
                 'item' => Item::new(DisplayString::fromDecoded('😊')),

tests/TypeTest.php

@@ -59,7 +59,7 @@ public static function itemTypeProvider(): iterable
             ],
             'string as a Bytesequence' => [
                 'value' => '42',
-                'expectedType' => Type::ByteSequence,
+                'expectedType' => Type::String,
             ],
             'string as a String' => [
                 'value' => 'Hello Boy!',
@@ -85,10 +85,6 @@ public static function itemTypeProvider(): iterable
                 'value' => Item::new(new DateTimeImmutable('2020-07-12 13:37:00')),
                 'expectedType' => Type::Date,
             ],
-            'a display string from a string' => [
-                'value' => 'füü',
-                'expectedType' => Type::DisplayString,
-            ],
             'a display string from an object' => [
                 'value' => DisplayString::fromDecoded('füü'),
                 'expectedType' => Type::DisplayString,