Skip to content

Commit c0ff7d3

Browse files
committed
Improve InnerList::clear testing
1 parent 0d9298a commit c0ff7d3

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

CHANGELOG.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ All Notable changes to `bakame/http-strucured-fields` will be documented in this
66

77
### Added
88

9-
- The `MemberContainer` interface.
9+
- The `Container` interface.
1010
- The `ParameterAccess` interface.
11-
- The `InvaludArgument` exception.
11+
- The `InvalidArgument` exception.
1212
- `OrderedList`, `InnerList` now implements the `MemberList` interface.
1313
- `Parameters` and `Dictionnary` now implements the PHP `OrderedMap` interface.
1414
- `Token::value` is a readonly property.
@@ -17,10 +17,9 @@ All Notable changes to `bakame/http-strucured-fields` will be documented in this
1717

1818
### Fixed
1919

20-
- **[BC Break]** `Item::value` readonly property is removed; use `Item::value()` method instead.
21-
- **[BC Break]** `Parameters::values` and `Parameters::value` methods also decode `ByteSequence` and `Token` classes.
22-
- **[BC Break]** `Parameters::values` methods no longer throw on invalid state; value is skipped from returned array.
23-
- **[BC Break]** `Parameters::value` methods no longer throw on invalid state; `null` value is returned instead.
20+
- **[BC Break]** `Parameters::values` and `Parameters::value` decode `ByteSequence` and `Token` classes.
21+
- **[BC Break]** `Parameters::values` no longer throw on invalid state; value is skipped from returned array.
22+
- **[BC Break]** `Parameters::value` no longer throw on invalid state; `null` value is returned instead.
2423

2524
### Deprecated
2625

src/InnerListTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ public function it_can_be_instantiated_with_an_collection_of_item(): void
2222

2323
self::assertSame($stringItem, $instance->get(0));
2424
self::assertTrue($instance->hasMembers());
25-
25+
self::assertTrue($instance->parameters->hasMembers());
2626
self::assertEquals($arrayParams, iterator_to_array($instance));
27+
2728
$instance->clear();
29+
2830
self::assertFalse($instance->hasMembers());
31+
self::assertTrue($instance->parameters->hasMembers());
2932
}
3033

3134
/** @test */

src/OrderedListTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
final class OrderedListTest extends StructuredFieldTest
1111
{
12-
/** @var array|string[] */
12+
/** @var array<string> */
1313
protected array $paths = [
1414
__DIR__.'/../vendor/httpwg/structured-field-tests/list.json',
1515
__DIR__.'/../vendor/httpwg/structured-field-tests/listlist.json',
@@ -60,7 +60,7 @@ public function it_can_add_or_remove_members(): void
6060
/** @test */
6161
public function it_can_unshift_insert_and_replace(): void
6262
{
63-
$instance = OrderedList::fromList();
63+
$instance = OrderedList::from();
6464
$instance->unshift(Item::from('42'));
6565
$instance->push(Item::from(42));
6666
$instance->insert(1, Item::from(42.0));
@@ -79,7 +79,7 @@ public function it_fails_to_replace_invalid_index(): void
7979
{
8080
$this->expectException(InvalidOffset::class);
8181

82-
$container = OrderedList::fromList();
82+
$container = OrderedList::from();
8383
$container->replace(0, Item::from(ByteSequence::fromDecoded('Hello World')));
8484
}
8585

@@ -88,7 +88,7 @@ public function it_fails_to_insert_at_an_invalid_index(): void
8888
{
8989
$this->expectException(InvalidOffset::class);
9090

91-
$container = OrderedList::fromList();
91+
$container = OrderedList::from();
9292
$container->insert(3, Item::from(ByteSequence::fromDecoded('Hello World')));
9393
}
9494

@@ -97,7 +97,7 @@ public function it_fails_to_return_an_member_with_invalid_index(): void
9797
{
9898
$this->expectException(InvalidOffset::class);
9999

100-
$instance = OrderedList::fromList();
100+
$instance = OrderedList::from();
101101
self::assertFalse($instance->has(3));
102102

103103
$instance->get(3);
@@ -121,7 +121,7 @@ public function test_it_can_generate_the_same_value(): void
121121
/** @test */
122122
public function it_implements_the_array_access_interface(): void
123123
{
124-
$sequence = OrderedList::fromList();
124+
$sequence = OrderedList::from();
125125
$sequence[] = InnerList::from(42, 69);
126126

127127
self::assertTrue(isset($sequence[0]));
@@ -142,7 +142,7 @@ public function it_fails_to_insert_unknown_index_via_the_array_access_interface(
142142
{
143143
$this->expectException(StructuredFieldError::class);
144144

145-
$sequence = OrderedList::fromList();
145+
$sequence = OrderedList::from();
146146
$sequence[0] = Item::from(42.0);
147147
}
148148

@@ -160,7 +160,7 @@ public function it_fails_http_conversion_with_invalid_parameters(): void
160160
{
161161
$this->expectException(StructuredFieldError::class);
162162

163-
$structuredField = OrderedList::fromList();
163+
$structuredField = OrderedList::from();
164164
$structuredField[] = 42;
165165
$item = $structuredField[0];
166166
$item->parameters->append('forty-two', '42');

src/ParametersTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212
final class ParametersTest extends StructuredFieldTest
1313
{
14-
/** @var array|string[] */
14+
/** @var array<string> */
1515
protected array $paths = [
1616
__DIR__.'/../vendor/httpwg/structured-field-tests/param-dict.json',
1717
__DIR__.'/../vendor/httpwg/structured-field-tests/param-list.json',

0 commit comments

Comments
 (0)