Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Grid] Introduce variadics #5636

Merged
merged 2 commits into from
Jul 29, 2016
Merged

[Grid] Introduce variadics #5636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
110fed7
[Grid] Use variadics in expression builder
pamil Jul 28, 2016
56c1551
[Grid] Decrease nesting level in StringFilter
pamil Jul 28, 2016
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
20 changes: 4 additions & 16 deletions src/Sylius/Bundle/GridBundle/Doctrine/DBAL/ExpressionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,17 @@ function __construct(QueryBuilder $queryBuilder)
/**
* {@inheritdoc}
*/
public function andX($expressions)
public function andX(...$expressions)
{
$expr = $this->queryBuilder->expr();

if (is_array($expressions)) {
return call_user_func_array([$expr, 'andX'], $expressions);
}

return $this->queryBuilder->expr()->andX(func_get_args());
return $this->queryBuilder->expr()->andX(...$expressions);
}

/**
* {@inheritdoc}
*/
public function orX($expressions)
public function orX(...$expressions)
{
$expr = $this->queryBuilder->expr();

if (is_array($expressions)) {
return call_user_func_array([$expr, 'orX'], $expressions);
}

return $this->queryBuilder->expr()->orX(func_get_args());
return $this->queryBuilder->expr()->orX(...$expressions);
}

/**
Expand Down
20 changes: 4 additions & 16 deletions src/Sylius/Bundle/GridBundle/Doctrine/ORM/ExpressionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,17 @@ public function __construct(QueryBuilder $queryBuilder)
/**
* {@inheritdoc}
*/
public function andX($expressions)
public function andX(...$expressions)
{
$expr = $this->queryBuilder->expr();

if (is_array($expressions)) {
return call_user_func_array([$expr, 'andX'], $expressions);
}

return $this->queryBuilder->expr()->andX(func_get_args());
return $this->queryBuilder->expr()->andX(...$expressions);
}

/**
* {@inheritdoc}
*/
public function orX($expressions)
public function orX(...$expressions)
{
$expr = $this->queryBuilder->expr();

if (is_array($expressions)) {
return call_user_func_array([$expr, 'orX'], $expressions);
}

return $this->queryBuilder->expr()->orX(func_get_args());
return $this->queryBuilder->expr()->orX(...$expressions);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/GridBundle/Doctrine/PHPCRODM/ExpressionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ public function __construct(CollectionsExpressionBuilder $expressionBuilder = nu
/**
* {@inheritdoc}
*/
public function andX($expressions)
public function andX(...$expressions)
{
return $this->expressionBuilder->andX($expressions);
return $this->expressionBuilder->andX(...$expressions);
}

/**
* {@inheritdoc}
*/
public function orX($expressions)
public function orX(...$expressions)
{
return $this->expressionBuilder->orX($expressions);
return $this->expressionBuilder->orX(...$expressions);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Sylius/Component/Grid/Data/ExpressionBuilderInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
interface ExpressionBuilderInterface
{
/**
* @param mixed $expressions
* @param mixed ...$expressions
*
* @return self
*/
public function andX($expressions);
public function andX(...$expressions);

/**
* @param mixed $expressions
* @param mixed ...$expressions
*
* @return self
*/
public function orX($expressions);
public function orX(...$expressions);

/**
* @param string $field
Expand Down
17 changes: 8 additions & 9 deletions src/Sylius/Component/Grid/Filter/StringFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,25 @@ public function apply(DataSourceInterface $dataSource, $name, $data, array $opti
}

if (1 === count($fields)) {
$expression = $this->getExpression($expressionBuilder, $type, $fields[0], $value);
} else {
$expressions = [];
$dataSource->restrict($this->getExpression($expressionBuilder, $type, current($fields), $value));

foreach ($fields as $field) {
$expressions[] = $this->getExpression($expressionBuilder, $type, $field, $value);
}
return;
}

$expression = $expressionBuilder->orX($expressions);
$expressions = [];
foreach ($fields as $field) {
$expressions[] = $this->getExpression($expressionBuilder, $type, $field, $value);
}

$dataSource->restrict($expression);
$dataSource->restrict($expressionBuilder->orX(...$expressions));
}

/**
* @param ExpressionBuilderInterface $expressionBuilder
* @param string $type
* @param string $field
* @param mixed $value
*
*
* @return ExpressionBuilderInterface
*/
private function getExpression(ExpressionBuilderInterface $expressionBuilder, $type, $field, $value)
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Grid/spec/Filter/StringFilterSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ function it_filters_in_multiple_fields(

$expressionBuilder->like('firstName', '%John%')->willReturn('EXPR1');
$expressionBuilder->like('lastName', '%John%')->willReturn('EXPR2');
$expressionBuilder->orX(['EXPR1', 'EXPR2'])->willReturn('EXPR');
$expressionBuilder->orX('EXPR1', 'EXPR2')->willReturn('EXPR');

$dataSource->restrict('EXPR')->shouldBeCalled();

Expand Down