Skip to content

has_child and has_parent improvements #198

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

Merged
merged 1 commit into from
Feb 24, 2015
Merged

has_child and has_parent improvements #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 36 additions & 9 deletions DSL/Filter/HasChildFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ class HasChildFilter implements BuilderInterface
{
use ParametersTrait;

const INNER_QUERY = 'query';
const INNER_FILTER = 'filter';

/**
* @var string
*/
Expand All @@ -31,15 +34,34 @@ class HasChildFilter implements BuilderInterface
*/
private $filter;

/**
* @var BuilderInterface
*/
private $query;

/**
* @param string $type
* @param BuilderInterface $filter
* @param BuilderInterface $block
* @param array $parameters
* @param string $inner
*
* @throws \InvalidArgumentException
*/
public function __construct($type, BuilderInterface $filter, array $parameters = [])
public function __construct($type, BuilderInterface $block, array $parameters = [], $inner = self::INNER_FILTER)
{
$this->type = $type;
$this->filter = $filter;

switch ($inner) {
case 'filter':
$this->filter = $block;
break;
case 'query':
$this->query = $block;
break;
default:
throw new \InvalidArgumentException('Not supported argument type');
}

$this->setParameters($parameters);
}

Expand All @@ -56,12 +78,17 @@ public function getType()
*/
public function toArray()
{
$query = [
'type' => $this->type,
'filter' => [
$this->filter->getType() => $this->filter->toArray(),
],
];
$query = [ 'type' => $this->type ];

$queries = ['filter', 'query'];

foreach ($queries as $type) {
if ($this->{$type}) {
$query[$type] = [
$this->{$type}->getType() => $this->{$type}->toArray(),
];
}
}

$output = $this->processArray($query);

Expand Down
51 changes: 41 additions & 10 deletions DSL/Filter/HasParentFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ class HasParentFilter implements BuilderInterface
{
use ParametersTrait;

const INNER_QUERY = 'query';
const INNER_FILTER = 'filter';

/**
* @var string
*/
Expand All @@ -31,15 +34,38 @@ class HasParentFilter implements BuilderInterface
*/
private $filter;

/**
* @var BuilderInterface
*/
private $query;

/**
* @param string $parentType
* @param BuilderInterface $filter
* @param BuilderInterface $block
* @param array $parameters
* @param string $inner
*
* @throws \InvalidArgumentException
*/
public function __construct($parentType, BuilderInterface $filter, array $parameters = [])
{
public function __construct(
$parentType,
BuilderInterface $block,
array $parameters = [],
$inner = self::INNER_FILTER
) {
$this->parentType = $parentType;
$this->filter = $filter;

switch ($inner) {
case 'filter':
$this->filter = $block;
break;
case 'query':
$this->query = $block;
break;
default:
throw new \InvalidArgumentException('Not supported argument type');
}

$this->setParameters($parameters);
}

Expand All @@ -56,12 +82,17 @@ public function getType()
*/
public function toArray()
{
$query = [
'parent_type' => $this->parentType,
'filter' => [
$this->filter->getType() => $this->filter->toArray(),
],
];
$query = [ 'parent_type' => $this->parentType ];

$queries = ['filter', 'query'];

foreach ($queries as $type) {
if ($this->{$type}) {
$query[$type] = [
$this->{$type}->getType() => $this->{$type}->toArray(),
];
}
}

$output = $this->processArray($query);

Expand Down