Skip to content

Commit 6cfabca

Browse files
nyamsprodnyamsprod
committed
update tests to use the new methods
1 parent 5f72921 commit 6cfabca

File tree

5 files changed

+68
-68
lines changed

5 files changed

+68
-68
lines changed

‎src/DictionaryTest.php

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ final class DictionaryTest extends StructuredFieldTestCase
1717
#[Test]
1818
public function it_can_be_instantiated_with_an_collection_of_item_or_inner_list(): void
1919
{
20-
$stringItem = Item::fromAssociative('helloWorld');
21-
$booleanItem = Item::fromAssociative(true);
20+
$stringItem = Item::fromString('helloWorld');
21+
$booleanItem = Item::true();
2222
$arrayParams = ['string' => $stringItem, 'boolean' => $booleanItem];
2323
$instance = Dictionary::fromAssociative($arrayParams);
2424

@@ -34,8 +34,8 @@ public function it_can_be_instantiated_with_an_collection_of_item_or_inner_list(
3434
#[Test]
3535
public function it_can_be_instantiated_with_key_value_pairs(): void
3636
{
37-
$stringItem = Item::fromAssociative('helloWorld');
38-
$booleanItem = Item::fromAssociative(true);
37+
$stringItem = Item::fromString('helloWorld');
38+
$booleanItem = Item::true();
3939
$arrayParams = [['string', $stringItem], ['boolean', $booleanItem]];
4040
$instance = Dictionary::fromPairs($arrayParams);
4141

@@ -49,8 +49,8 @@ public function it_can_be_instantiated_with_key_value_pairs(): void
4949
#[Test]
5050
public function it_can_add_or_remove_members(): void
5151
{
52-
$stringItem = Item::fromAssociative('helloWorld');
53-
$booleanItem = Item::fromAssociative(true);
52+
$stringItem = Item::fromString('helloWorld');
53+
$booleanItem = Item::true();
5454
$arrayParams = ['string' => $stringItem, 'boolean' => $booleanItem];
5555
$instance = Dictionary::fromAssociative($arrayParams);
5656

@@ -64,10 +64,10 @@ public function it_can_add_or_remove_members(): void
6464
self::assertFalse($deletedInstance->has('boolean'));
6565
self::assertFalse($deletedInstance->hasPair(1));
6666

67-
$appendInstance = $deletedInstance->append('foobar', Item::fromAssociative('BarBaz'));
67+
$appendInstance = $deletedInstance->append('foobar', Item::new('BarBaz'));
6868
self::assertTrue($appendInstance->hasPair(1));
6969

70-
self::assertSame($appendInstance, $appendInstance->append('foobar', Item::fromAssociative('BarBaz')));
70+
self::assertSame($appendInstance, $appendInstance->append('foobar', Item::new('BarBaz')));
7171

7272
/** @var array{0:string, 1:Item} $foundItem */
7373
$foundItem = $appendInstance->pair(1);
@@ -126,8 +126,8 @@ public function it_fails_to_add_an_item_with_wrong_key(): void
126126
public function it_can_prepend_a_new_member(): void
127127
{
128128
$instance = Dictionary::new()
129-
->append('a', Item::fromAssociative(false))
130-
->prepend('b', Item::fromAssociative(true));
129+
->append('a', Item::false())
130+
->prepend('b', Item::true());
131131

132132
self::assertSame('b, a=?0', (string) $instance);
133133
}
@@ -140,74 +140,74 @@ public function it_can_returns_the_container_member_keys(): void
140140
self::assertSame([], $instance->keys());
141141

142142
$newInstance = $instance
143-
->append('a', Item::fromAssociative(false))
144-
->prepend('b', Item::fromAssociative(true));
143+
->append('a', Item::false())
144+
->prepend('b', Item::true());
145145

146146
self::assertSame(['b', 'a'], $newInstance->keys());
147147
}
148148

149149
#[Test]
150150
public function it_can_merge_one_or_more_instances_using_associative(): void
151151
{
152-
$instance1 = Dictionary::fromAssociative(['a' => Item::fromAssociative(false)]);
153-
$instance2 = Dictionary::fromAssociative(['b' => Item::fromAssociative(true)]);
154-
$instance3 = Dictionary::fromAssociative(['a' => Item::fromAssociative(42)]);
152+
$instance1 = Dictionary::fromAssociative(['a' => Item::false()]);
153+
$instance2 = Dictionary::fromAssociative(['b' => Item::true()]);
154+
$instance3 = Dictionary::fromAssociative(['a' => Item::new(42)]);
155155

156156
$instance4 = $instance1->mergeAssociative($instance2, $instance3);
157157

158158
self::assertCount(2, $instance4);
159-
self::assertEquals(Item::fromAssociative(42), $instance4->get('a'));
160-
self::assertEquals(Item::fromAssociative(true), $instance4->get('b'));
159+
self::assertEquals(Item::new(42), $instance4->get('a'));
160+
self::assertEquals(Item::true(), $instance4->get('b'));
161161
}
162162

163163
#[Test]
164164
public function it_can_merge_two_or_more_instances_to_yield_different_result(): void
165165
{
166-
$instance1 = Dictionary::fromAssociative(['a' => Item::fromAssociative(false)]);
167-
$instance2 = Dictionary::fromAssociative(['b' => Item::fromAssociative(true)]);
168-
$instance3 = Dictionary::fromAssociative(['a' => Item::fromAssociative(42)]);
166+
$instance1 = Dictionary::fromAssociative(['a' => Item::false()]);
167+
$instance2 = Dictionary::fromAssociative(['b' => Item::true()]);
168+
$instance3 = Dictionary::fromAssociative(['a' => Item::new(42)]);
169169

170170
$instance4 = $instance3->mergeAssociative($instance2, $instance1);
171171

172172
self::assertCount(2, $instance4);
173-
self::assertEquals(Item::fromAssociative(false), $instance4->get('a'));
174-
self::assertEquals(Item::fromAssociative(true), $instance4->get('b'));
173+
self::assertEquals(Item::false(), $instance4->get('a'));
174+
self::assertEquals(Item::true(), $instance4->get('b'));
175175
}
176176

177177
#[Test]
178178
public function it_can_merge_without_argument_and_not_throw(): void
179179
{
180-
self::assertCount(1, Dictionary::fromAssociative(['a' => Item::fromAssociative(false)])->mergeAssociative());
180+
self::assertCount(1, Dictionary::fromAssociative(['a' => Item::false()])->mergeAssociative());
181181
}
182182

183183
#[Test]
184184
public function it_can_merge_one_or_more_instances_using_pairs(): void
185185
{
186-
$instance1 = Dictionary::fromPairs([['a', Item::fromAssociative(false)]]);
187-
$instance2 = Dictionary::fromPairs([['b', Item::fromAssociative(true)]]);
188-
$instance3 = Dictionary::fromPairs([['a', Item::fromAssociative(42)]]);
186+
$instance1 = Dictionary::fromPairs([['a', Item::false()]]);
187+
$instance2 = Dictionary::fromPairs([['b', Item::true()]]);
188+
$instance3 = Dictionary::fromPairs([['a', Item::new(42)]]);
189189

190190
$instance4 = $instance3->mergePairs($instance2, $instance1);
191191

192192
self::assertCount(2, $instance4);
193193

194-
self::assertEquals(Item::fromAssociative(false), $instance4->get('a'));
195-
self::assertEquals(Item::fromAssociative(true), $instance4->get('b'));
194+
self::assertEquals(Item::false(), $instance4->get('a'));
195+
self::assertEquals(Item::true(), $instance4->get('b'));
196196
}
197197

198198
#[Test]
199199
public function it_can_merge_without_pairs_and_not_throw(): void
200200
{
201-
$instance = Dictionary::fromAssociative(['a' => Item::fromAssociative(false)]);
201+
$instance = Dictionary::fromAssociative(['a' => Item::false()]);
202202

203203
self::assertCount(1, $instance->mergePairs());
204204
}
205205

206206
#[Test]
207207
public function it_can_merge_dictionary_instances_via_pairs_or_associative(): void
208208
{
209-
$instance1 = Dictionary::fromAssociative(['a' => Item::fromAssociative(false)]);
210-
$instance2 = Dictionary::fromAssociative(['b' => Item::fromAssociative(true)]);
209+
$instance1 = Dictionary::fromAssociative(['a' => Item::false()]);
210+
$instance2 = Dictionary::fromAssociative(['b' => Item::true()]);
211211

212212
$instance3 = clone $instance1;
213213
$instance4 = clone $instance2;

‎src/InnerListTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ final class InnerListTest extends TestCase
1414
#[Test]
1515
public function it_can_be_instantiated_with_an_collection_of_item(): void
1616
{
17-
$stringItem = Item::fromAssociative('helloWorld');
18-
$booleanItem = Item::fromAssociative(true);
17+
$stringItem = Item::fromString('helloWorld');
18+
$booleanItem = Item::true();
1919
$arrayParams = [$stringItem, $booleanItem];
20-
$instance = InnerList::fromAssociative($arrayParams, ['test' => Item::fromAssociative(42)]);
20+
$instance = InnerList::fromAssociative($arrayParams, ['test' => Item::new(42)]);
2121

2222
self::assertSame($stringItem, $instance->get(0));
2323
self::assertTrue($instance->hasMembers());
@@ -29,7 +29,7 @@ public function it_can_be_instantiated_with_an_collection_of_item(): void
2929
#[Test]
3030
public function it_can_add_or_remove_members(): void
3131
{
32-
$stringItem = Item::fromAssociative('helloWorld');
32+
$stringItem = Item::fromString('helloWorld');
3333
$booleanItem = Item::true();
3434
$instance = InnerList::new($stringItem, $booleanItem);
3535

‎src/OuterList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static function filterMember(mixed $member): object
4747
return match (true) {
4848
$member instanceof ParameterAccess && ($member instanceof MemberList || $member instanceof ValueAccess) => $member,
4949
is_iterable($member) => InnerList::new(...$member),
50-
default => Item::fromAssociative($member),
50+
default => Item::new($member),
5151
};
5252
}
5353

‎src/OuterListTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ final class OuterListTest extends StructuredFieldTestCase
1818
#[Test]
1919
public function it_can_be_instantiated_with_an_collection_of_item(): void
2020
{
21-
$stringItem = Item::fromAssociative('helloWorld');
22-
$booleanItem = Item::fromAssociative(true);
21+
$stringItem = Item::new('helloWorld');
22+
$booleanItem = Item::true();
2323
$arrayParams = [$stringItem, $booleanItem];
2424
$instance = OuterList::new(...$arrayParams);
2525

@@ -32,8 +32,8 @@ public function it_can_be_instantiated_with_an_collection_of_item(): void
3232
#[Test]
3333
public function it_can_add_or_remove_members(): void
3434
{
35-
$stringItem = Item::fromAssociative('helloWorld');
36-
$booleanItem = Item::fromAssociative(true);
35+
$stringItem = Item::new('helloWorld');
36+
$booleanItem = Item::true();
3737
$arrayParams = [$stringItem, $booleanItem];
3838
$instance = OuterList::new(...$arrayParams);
3939

@@ -65,10 +65,10 @@ public function it_can_add_or_remove_members(): void
6565
public function it_can_unshift_insert_and_replace(): void
6666
{
6767
$instance = OuterList::new()
68-
->unshift(Item::fromAssociative('42'))
69-
->push(Item::fromAssociative(42))
70-
->insert(1, Item::fromAssociative(42.0))
71-
->replace(0, Item::fromAssociative(ByteSequence::fromDecoded('Hello World')));
68+
->unshift(Item::fromString('42'))
69+
->push(Item::fromInteger(42))
70+
->insert(1, Item::fromDecimal(42.0))
71+
->replace(0, Item::new(ByteSequence::fromDecoded('Hello World')));
7272

7373
self::assertCount(3, $instance);
7474
self::assertTrue($instance->hasMembers());
@@ -124,7 +124,7 @@ public function it_fails_to_insert_unknown_index_via_the_array_access_interface(
124124
{
125125
$this->expectException(StructuredFieldError::class);
126126

127-
OuterList::new()->insert(0, Item::fromAssociative(42.0));
127+
OuterList::new()->insert(0, Item::fromDecimal(42.0));
128128
}
129129

130130
#[Test]
@@ -202,7 +202,7 @@ public function it_can_returns_the_container_member_keys(): void
202202
self::assertSame([], $instance->keys());
203203

204204
$newInstance = $instance
205-
->push(Item::fromAssociative(false), Item::fromAssociative(true));
205+
->push(Item::false(), Item::true());
206206

207207
self::assertSame([0, 1], $newInstance->keys());
208208

‎src/ParametersTest.php

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ final class ParametersTest extends StructuredFieldTestCase
1919
#[Test]
2020
public function it_can_be_instantiated_with_an_collection_of_item(): void
2121
{
22-
$stringItem = Item::fromAssociative('helloWorld');
23-
$booleanItem = Item::fromAssociative(true);
22+
$stringItem = Item::fromString('helloWorld');
23+
$booleanItem = Item::true();
2424
$arrayParams = ['string' => $stringItem, 'boolean' => $booleanItem];
2525
$instance = Parameters::fromAssociative($arrayParams);
2626

@@ -35,8 +35,8 @@ public function it_can_be_instantiated_with_an_collection_of_item(): void
3535
#[Test]
3636
public function test_it_can_be_instantiated_with_key_value_pairs(): void
3737
{
38-
$stringItem = Item::fromAssociative('helloWorld');
39-
$booleanItem = Item::fromAssociative(true);
38+
$stringItem = Item::fromString('helloWorld');
39+
$booleanItem = Item::true();
4040
$arrayParams = [['string', $stringItem], ['boolean', $booleanItem]];
4141
$instance = Parameters::fromPairs($arrayParams);
4242

@@ -73,8 +73,8 @@ public function it_fails_to_instantiate_with_an_item_containing_already_paramete
7373
#[Test]
7474
public function it_can_add_or_remove_members(): void
7575
{
76-
$stringItem = Item::fromAssociative('helloWorld');
77-
$booleanItem = Item::fromAssociative(true);
76+
$stringItem = Item::fromString('helloWorld');
77+
$booleanItem = Item::true();
7878
$arrayParams = ['string' => $stringItem, 'boolean' => $booleanItem];
7979
$instance = Parameters::fromAssociative($arrayParams);
8080

@@ -113,8 +113,8 @@ public function it_can_add_or_remove_members(): void
113113
#[Test]
114114
public function it_returns_the_same_object_if_no_member_is_removed(): void
115115
{
116-
$stringItem = Item::fromAssociative('helloWorld');
117-
$booleanItem = Item::fromAssociative(true);
116+
$stringItem = Item::new('helloWorld');
117+
$booleanItem = Item::true();
118118
$arrayParams = ['string' => $stringItem, 'boolean' => $booleanItem];
119119
$instance = Parameters::fromAssociative($arrayParams);
120120

@@ -158,8 +158,8 @@ public function it_fails_to_return_an_member_with_invalid_index(): void
158158
public function it_can_prepend_a_new_member(): void
159159
{
160160
$instance = Parameters::new()
161-
->append('a', Item::fromAssociative(false))
162-
->prepend('b', Item::fromAssociative(true));
161+
->append('a', Item::false())
162+
->prepend('b', Item::true());
163163

164164
self::assertSame(';b;a=?0', $instance->toHttpValue());
165165
self::assertSame(';b;a=?0', (string) $instance);
@@ -173,8 +173,8 @@ public function it_can_returns_the_container_member_keys(): void
173173
self::assertSame([], $instance->keys());
174174

175175
$newInstance = Parameters::new()
176-
->append('a', Item::fromAssociative(false))
177-
->prepend('b', Item::fromAssociative(true));
176+
->append('a', Item::false())
177+
->prepend('b', Item::true());
178178

179179
self::assertSame(['b', 'a'], $newInstance->keys());
180180
}
@@ -188,8 +188,8 @@ public function it_can_merge_one_or_more_instances(): void
188188

189189
$instance4 = $instance1->mergeAssociative($instance2, $instance3);
190190

191-
self::assertEquals(Item::fromAssociative(42), $instance4->get('a'));
192-
self::assertEquals(Item::fromAssociative(true), $instance4->get('b'));
191+
self::assertEquals(Item::fromInteger(42), $instance4->get('a'));
192+
self::assertEquals(Item::true(), $instance4->get('b'));
193193
}
194194

195195
#[Test]
@@ -208,23 +208,23 @@ public function it_can_merge_two_or_more_dictionaries_different_result(): void
208208
#[Test]
209209
public function it_can_merge_without_argument_and_not_throw(): void
210210
{
211-
$instance = Parameters::fromAssociative(['a' => Item::fromAssociative(false)]);
211+
$instance = Parameters::fromAssociative(['a' => Item::false()]);
212212

213213
self::assertCount(1, $instance->mergeAssociative());
214214
}
215215

216216
#[Test]
217217
public function it_can_merge_one_or_more_instances_using_pairs(): void
218218
{
219-
$instance1 = Parameters::fromPairs([['a', Item::fromAssociative(false)]]);
220-
$instance2 = Parameters::fromPairs([['b', Item::fromAssociative(true)]]);
221-
$instance3 = Parameters::fromPairs([['a', Item::fromAssociative(42)]]);
219+
$instance1 = Parameters::fromPairs([['a', Item::false()]]);
220+
$instance2 = Parameters::fromPairs([['b', Item::true()]]);
221+
$instance3 = Parameters::fromPairs([['a', Item::new(42)]]);
222222

223223
$instance4 = $instance3->mergePairs($instance2, $instance1);
224224

225225
self::assertCount(2, $instance4);
226-
self::assertEquals(Item::fromAssociative(false), $instance4->get('a'));
227-
self::assertEquals(Item::fromAssociative(true), $instance4->get('b'));
226+
self::assertEquals(Item::false(), $instance4->get('a'));
227+
self::assertEquals(Item::true(), $instance4->get('b'));
228228
}
229229

230230
#[Test]
@@ -249,8 +249,8 @@ public function it_can_merge_dictionary_instances_via_pairs_or_associative(): vo
249249
public function it_can_return_bare_items_values(): void
250250
{
251251
$instance = Parameters::fromAssociative([
252-
'string' => Item::fromAssociative('helloWorld'),
253-
'boolean' => Item::fromAssociative(true),
252+
'string' => Item::fromString('helloWorld'),
253+
'boolean' => Item::true(),
254254
]);
255255

256256
self::assertSame('helloWorld', $instance->get('string')->value());

0 commit comments

Comments
 (0)