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
10 changes: 7 additions & 3 deletions src/Http/Components/QueryParameters/ReadsQueryParameters.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@ public function __construct(array $queryParameters = [])
*/
public function get(string $name): null|array|bool|float|int|string
{
return count($this->queryParameters) > 1
? $this->queryParameters[$name]
: $this->first($name);
$value = $this->queryParameters[$name] ?? null;

if ($value === null) {
return null;
}

return count($value) > 1 ? $value : $value[0];
}

public function first(string $name): null|bool|float|int|string
Expand Down
14 changes: 0 additions & 14 deletions src/Http/Parameters/ImmutableParameterCollection.php

This file was deleted.

17 changes: 0 additions & 17 deletions src/Http/Parameters/MutableParameterCollection.php

This file was deleted.

42 changes: 0 additions & 42 deletions src/Http/Parameters/ReadsParameters.php

This file was deleted.

79 changes: 0 additions & 79 deletions src/Http/Parameters/WritesParameters.php

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?php

declare(strict_types=1);

namespace Rest\Tests\Http\Components\QueryParameters;

use PHPUnit\Framework\TestCase;
use Rest\Http\Components\QueryParameters\ImmutableQueryParameterCollection;
use Rest\Http\Components\QueryParameters\MutableQueryParameterCollection;

/**
* @internal
*/
class MutableQueryParameterCollectionTest extends TestCase
{
public function test_getting_query_parameters()
{
$parameters = [
'search' => ['query'],
'first_name' => ['Jim', 'Dwight'],
];

$queryParameters = new MutableQueryParameterCollection($parameters);

$this->assertSame('query', $queryParameters->get('search'));
$this->assertEqualsCanonicalizing(['Jim', 'Dwight'], $queryParameters->get('first_name'));
$this->assertNull($queryParameters->get('not_found'));
$this->assertEqualsCanonicalizing($parameters, $queryParameters->all());
}

public function test_getting_first_query_parameter()
{
$queryParameters = new MutableQueryParameterCollection([
'first_name' => ['Jim', 'Dwight'],
]);

$this->assertSame('Jim', $queryParameters->first('first_name'));
}

public function test_adding_query_parameter()
{
$queryParameters = new MutableQueryParameterCollection();

$queryParameters
->add('first_name', 'Jim')
->add('first_name', 'Dwight');

$this->assertEqualsCanonicalizing(['Jim', 'Dwight'], $queryParameters->get('first_name'));
}

public function test_setting_query_parameter()
{
$queryParameters = new MutableQueryParameterCollection();

$queryParameters
->add('first_name', 'Bob')
->set('first_name', 'Jim');

$this->assertSame('Jim', $queryParameters->get('first_name'));
}

public function test_merging_collection_parameters()
{
$queryParameters = new MutableQueryParameterCollection([
'first_name' => ['Jim', 'Dwight'],
]);

$queryParameters->merge(['first_name' => 'Larry']);

$this->assertEqualsCanonicalizing(
['Jim', 'Dwight', 'Larry'],
$queryParameters->get('first_name')
);
}

public function test_replacing_collection_parameters()
{
$queryParameters = new MutableQueryParameterCollection([
'first_name' => ['Jim', 'Dwight'],
]);

$queryParameters->replace(['first_name' => 'Larry']);

$this->assertEqualsCanonicalizing(
'Larry',
$queryParameters->get('first_name')
);
}

public function test_converting_to_immutable_collection()
{
$queryParameters = new MutableQueryParameterCollection([
'first_name' => ['Jim'],
]);

$queryParameters = $queryParameters->toImmutable();

$this->assertInstanceOf(ImmutableQueryParameterCollection::class, $queryParameters);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Http\Segments;
namespace Rest\Tests\Http\Components\Segments;

use PHPUnit\Framework\TestCase;
use Rest\Http\Components\Segments\MutableSegmentCollection;
Expand Down
98 changes: 0 additions & 98 deletions tests/Http/Parameters/MutableParameterCollectionTest.php

This file was deleted.

2 changes: 1 addition & 1 deletion tests/Http/Request/RestRequestBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function test_making_a_request_with_query_parameters()
])
->make();

$this->assertSame(['my-query'], $request->queryParameters->get('search'));
$this->assertSame('my-query', $request->queryParameters->get('search'));
$this->assertSame(['John', 'Jack'], $request->queryParameters->get('first_name'));
}

Expand Down
Loading