Skip to content

Commit 3d044f5

Browse files
committed
Fix test suite
1 parent 010294e commit 3d044f5

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

src/ByteSequence.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Stringable;
88

99
use Throwable;
10+
1011
use function base64_decode;
1112
use function base64_encode;
1213
use function preg_match;

src/Type.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Bakame\Http\StructuredFields;
66

77
use DateTimeInterface;
8-
use Throwable;
98

109
/**
1110
* @see https://www.rfc-editor.org/rfc/rfc8941.html#section-3.3
@@ -49,10 +48,10 @@ public static function tryFromValue(mixed $value): self|null
4948
is_float($value) => Type::Decimal,
5049
is_bool($value) => Type::Boolean,
5150
is_string($value) => match (true) {
52-
1 === preg_match('/[^\x20-\x7f]/', $value) => Type::DisplayString,
53-
1 === preg_match("/^([a-z*][a-z\d:\/!#\$%&'*+\-.^_`|~]*)$/i", $value) => Type::Token,
54-
null !== ByteSequence::tryFromEncoded($value) => Type::ByteSequence,
55-
default => Type::String,
51+
1 === preg_match('/[^\x20-\x7f]/', $value) => Type::DisplayString,
52+
1 === preg_match("/^([a-z*][a-z\d:\/!#\$%&'*+\-.^_`|~]*)$/i", $value) => Type::Token,
53+
null !== ByteSequence::tryFromEncoded($value) => Type::ByteSequence,
54+
default => Type::String,
5655
},
5756
default => null,
5857
};

tests/ItemTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ public static function itemTypeProvider(): iterable
274274
],
275275
'string' => [
276276
'item' => Item::new('42'),
277-
'expectedType' => Type::String,
277+
'expectedType' => Type::ByteSequence,
278278
],
279279
'token' => [
280280
'item' => Item::new(Token::fromString('forty-two')),

tests/TypeTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,12 @@ public static function itemTypeProvider(): iterable
5757
'value' => 42.0,
5858
'expectedType' => Type::Decimal,
5959
],
60-
'string' => [
60+
'string as a Bytesequence' => [
6161
'value' => '42',
62+
'expectedType' => Type::ByteSequence,
63+
],
64+
'string as a String' => [
65+
'value' => 'Hello Boy!',
6266
'expectedType' => Type::String,
6367
],
6468
'token' => [

0 commit comments

Comments
 (0)