Skip to content
This repository has been archived by the owner on Aug 1, 2024. It is now read-only.

Allow entity usage in ChoiceFilterType per doctrine/orm:v2.6.4 changes #320

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow entity usage in ChoiceFilterType per doctrine/orm:v2.6.4 changes #320

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
9 changes: 5 additions & 4 deletions Event/Subscriber/AbstractDoctrineSubscriber.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

namespace Lexik\Bundle\FormFilterBundle\Event\Subscriber;

use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Types\Type;
use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\BooleanFilterType;
use Lexik\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Types\Type;

/**
* Provide Doctrine ORM and DBAL filters.
Expand All @@ -30,12 +31,12 @@ public function filterValue(GetFilterConditionEvent $event)
if (is_array($values['value']) && sizeof($values['value']) > 0) {
$event->setCondition(
$expr->in($event->getField(), ':'.$paramName),
array($paramName => array($values['value'], Connection::PARAM_STR_ARRAY))
array($paramName => new ArrayCollection($values['value']))
);
} elseif (!is_array($values['value'])) {
$event->setCondition(
$expr->eq($event->getField(), ':'.$paramName),
array($paramName => array($values['value'], Type::STRING))
array($paramName => $values['value'])
);
}
}
Expand Down