Skip to content

Commit a8649c9

Browse files
committed
Fix 100% coverage
1 parent 354ee8b commit a8649c9

File tree

4 files changed

+11
-23
lines changed

4 files changed

+11
-23
lines changed

spec/Query/GroupBySpec.php

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,36 @@
99

1010
class GroupBySpec extends ObjectBehavior
1111
{
12-
private string $alias = 'a';
13-
14-
private string $field = 'foo';
12+
private string $field = 'a.foo';
1513

1614
public function it_should_support_anything(): void
1715
{
18-
$this->beConstructedWith($this->field, GroupBy::ADD_GROUP_BY, $this->alias);
16+
$this->beConstructedWith($this->field, GroupBy::ADD_GROUP_BY);
1917

2018
$this->isSatisfiedBy('foo')->shouldReturn(true);
2119
}
2220

2321
public function it_calls_groupBy_on_query_builder(QueryBuilder $queryBuilder): void
2422
{
25-
$this->beConstructedWith($this->field, GroupBy::GROUP_BY, $this->alias);
23+
$this->beConstructedWith($this->field, GroupBy::GROUP_BY);
2624

27-
$arg = sprintf('%s.%s', $this->alias, $this->field);
28-
$queryBuilder->groupBy($arg)->shouldBeCalled()->willReturn($queryBuilder);
25+
$queryBuilder->groupBy($this->field)->shouldBeCalled()->willReturn($queryBuilder);
2926

30-
$this->modify($queryBuilder, $this->alias);
27+
$this->modify($queryBuilder);
3128
}
3229

3330
public function it_calls_addGroupBy_on_query_builder(QueryBuilder $queryBuilder): void
3431
{
35-
$this->beConstructedWith($this->field, GroupBy::ADD_GROUP_BY, $this->alias);
32+
$this->beConstructedWith($this->field, GroupBy::ADD_GROUP_BY);
3633

37-
$arg = sprintf('%s.%s', $this->alias, $this->field);
38-
$queryBuilder->addGroupBy($arg)->shouldBeCalled()->willReturn($queryBuilder);
34+
$queryBuilder->addGroupBy($this->field)->shouldBeCalled()->willReturn($queryBuilder);
3935

40-
$this->modify($queryBuilder, $this->alias);
36+
$this->modify($queryBuilder);
4137
}
4238

4339
public function it_throws_exception_when_setting_illegal_type(): void
4440
{
45-
$this->beConstructedWith($this->field, 'foo', $this->alias);
41+
$this->beConstructedWith($this->field, 'foo');
4642
$this->shouldThrow(InvalidArgumentException::class)->duringInstantiation();
4743
}
4844
}

spec/SpecificationRepositorySpec.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function it_should_accept_specification_with_only_query_modifiers(
9292

9393
$specification->modify($queryBuilder, $this->dqlAlias, Argument::any())->shouldBeCalled();
9494
$specification->isSatisfiedBy(Argument::any())->willReturn(true);
95-
$specification->modify($queryBuilder, $this->dqlAlias, Argument::any())->willReturn('');
95+
$specification->modify($queryBuilder, $this->dqlAlias, Argument::any())->willReturn(null);
9696

9797
$this->match($specification);
9898
}

src/Query/GroupBy.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ public function __construct(string $field, protected string $type = self::ADD_GR
3232
}
3333
}
3434

35-
/**
36-
* @throws InvalidArgumentException
37-
*/
38-
public function setType(string $type): self
39-
{
40-
return new self($this->field, $type, $this->dqlAlias);
41-
}
42-
4335
#[\Override]
4436
public function modify(QueryBuilder $queryBuilder, ?string $dqlAlias = null): ?string
4537
{

src/SpecificationRepositoryTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private function modifyQueryBuilder(QueryBuilder $queryBuilder, SpecificationInt
4040
{
4141
$condition = $specification->modify($queryBuilder, $this->dqlAlias);
4242

43-
if (null === $condition || '' === $condition || '0' === $condition) {
43+
if (null === $condition) {
4444
return;
4545
}
4646

0 commit comments

Comments
 (0)