Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/RequestParameterList/ArrayToListConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ public static function convert(array $array): RequestParameterList
$requestParameterList = new RequestParameterList();

foreach ($array as $key => $value) {
$requestParameterList->add($key, $value);
if (is_array($value)) {
$value = implode(',', $value);
}

$requestParameterList->add($key, (string) $value);
}

return $requestParameterList;
Expand Down
6 changes: 5 additions & 1 deletion src/RequestParameterList/RequestToListConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ public static function convert(Request $request): RequestParameterList
$requestParameterList = new RequestParameterList();

foreach ($request->query->all() as $key => $value) {
$requestParameterList->add($key, $value);
if (is_array($value)) {
$value = implode(',', $value);
}

$requestParameterList->add($key, (string) $value);
}

return $requestParameterList;
Expand Down
35 changes: 31 additions & 4 deletions tests/RequestParameterList/ArrayToListConverterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,39 @@ public function testConvertSimpleArray(): void
$this->assertSame('6', $result->get('month'));
}

public function testConvertNonStringValueThrowsTypeError(): void
public function testConvertIntegerValueToString(): void
{
$this->expectException(\TypeError::class);

ArrayToListConverter::convert([
$result = ArrayToListConverter::convert([
'size' => 25,
]);

$this->assertSame('25', $result->get('size'));
}

public function testConvertArrayValueToCommaSeparatedString(): void
{
$result = ArrayToListConverter::convert([
'tags' => ['foo', 'bar', 'baz'],
]);

$this->assertSame('foo,bar,baz', $result->get('tags'));
}

public function testConvertFloatValueToString(): void
{
$result = ArrayToListConverter::convert([
'latitude' => 52.52,
]);

$this->assertSame('52.52', $result->get('latitude'));
}

public function testConvertBooleanValueToString(): void
{
$result = ArrayToListConverter::convert([
'enabled' => true,
]);

$this->assertSame('1', $result->get('enabled'));
}
}
7 changes: 4 additions & 3 deletions tests/RequestParameterList/QueryStringToListConverterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ public function testConvertQueryStringWithUrlEncodedValues(): void
$this->assertSame('München', $result->get('city'));
}

public function testConvertQueryStringWithArrayParametersThrowsTypeError(): void
public function testConvertQueryStringWithArrayParameters(): void
{
$this->expectException(\TypeError::class);
$result = QueryStringToListConverter::convert('tags[]=foo&tags[]=bar');

QueryStringToListConverter::convert('tags[]=foo&tags[]=bar');
$this->assertTrue($result->has('tags'));
$this->assertSame('foo,bar', $result->get('tags'));
}

public function testConvertQueryStringWithMultipleParameters(): void
Expand Down
16 changes: 8 additions & 8 deletions tests/RequestParameterList/RequestToListConverterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ public function testConvertEmptyRequest(): void
$this->assertSame([], $result->getList());
}

public function testConvertRequestWithArrayQueryParameterThrowsTypeError(): void
public function testConvertRequestWithArrayQueryParameter(): void
{
$this->expectException(\TypeError::class);

$request = Request::create('/test', 'GET', ['tags' => ['foo', 'bar']]);

RequestToListConverter::convert($request);
$result = RequestToListConverter::convert($request);

$this->assertSame('foo,bar', $result->get('tags'));
}

public function testConvertRequestWithIntegerQueryParameterThrowsTypeError(): void
public function testConvertRequestWithIntegerQueryParameter(): void
{
$this->expectException(\TypeError::class);

$request = Request::create('/test', 'GET', ['size' => 25]);

RequestToListConverter::convert($request);
$result = RequestToListConverter::convert($request);

$this->assertSame('25', $result->get('size'));
}

public function testConvertRequestWithMultipleParameters(): void
Expand Down