Skip to content

Commit dd770bd

Browse files
committed
parser->query() now returns the complete query
1 parent 6241160 commit dd770bd

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

spec/Request/ParserSpec.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,25 @@ function it_checks_if_an_item_is_in_the_includes(Request $request, ParameterBag
5252
$this->inIncludes($entity)->shouldReturn(true);
5353
}
5454

55-
function it_gets_an_item_from_the_query(Request $request, ParameterBag $parameterBag)
55+
function it_gets_an_item_from_the_query(Request $request)
5656
{
5757
$item = 'foo';
5858
$return = 'bar';
5959

60-
$request->query = $parameterBag;
61-
$parameterBag->get($item)->shouldBeCalled(1)->willReturn($return);
60+
$request->query($item)->shouldBeCalled()->willReturn($return);
6261

6362
$this->query($item)->shouldReturn($return);
6463
}
6564

65+
function it_returns_the_query_as_an_array(Request $request)
66+
{
67+
$item = null;
68+
$return = ['foo' => 'bar', 'baz' => 'boo'];
69+
$request->query($item)->shouldBeCalled()->willReturn($return);
70+
71+
$this->query()->shouldReturn($return);
72+
}
73+
6674
function it_gets_an_item_from_the_header(Request $request, HeaderBag $headerBag)
6775
{
6876
$item = 'foo';

src/Contracts/Request/Parser.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ public function inIncludes($entity);
3636
public function includes();
3737

3838
/**
39-
* Get an item from the query
39+
* Get an item from the query string or return the query as an array
4040
*
4141
* @param string $item
4242
*
4343
* @return string
4444
*/
45-
public function query($item);
45+
public function query($item = null);
4646

4747
/**
4848
* The request's content type

src/Request/Parser.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ public function includes()
7070
/**
7171
* @inheritdoc
7272
*/
73-
public function query($item)
73+
public function query($item = null)
7474
{
75-
return $this->request->query->get($item);
75+
return $this->request->query($item);
7676
}
7777

7878
/**

0 commit comments

Comments
 (0)