RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #434 from bamarni/filter-objects

Browse Source 
allowed to pass filter objects to the configurator
This commit is contained in:
Guilherme Blanco 2012-11-02 17:52:23 -07:00
commit 7d7287a1ba
4 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Doctrine/ORM/Configuration.php
View File

@ -576,11 +576,22 @@ class Configuration extends \Doctrine\DBAL\Configuration
* Add a filter to the list of possible filters.
*
* @param string $name The name of the filter.
* @param string $className The class name of the filter.
* @param string|Query\Filter\SQLFilter $filter The filter class name or an
* SQLFilter instance.
*
* @throws \InvalidArgumentException If the filter is an object and it doesn't
* extend the Query\Filter\SQLFilter class.
*/
public function addFilter($name, $className)
public function addFilter($name, $filter)
{
$this->_attributes['filters'][$name] = $className;
if (is_object($filter) && ! $filter instanceof Query\Filter\SQLFilter) {
throw new \InvalidArgumentException(
"A filter can be either a class name or an object extending \Doctrine\ORM\Query\Filter\SQLFilter," .
" instance of '" . get_class($filter) . "' given."
);
}
$this->_attributes['filters'][$name] = $filter;
}
/**
@ -588,10 +599,10 @@ class Configuration extends \Doctrine\DBAL\Configuration
*
* @param string $name The name of the filter.
*
* @return string The class name of the filter, or null of it is not
* defined.
* @return string|Query\Filter\SQLFilter The class name of the filter, an
* SQLFilter instance or null of it is not defined.
*/
public function getFilterClassName($name)
public function getFilter($name)
{
return isset($this->_attributes['filters'][$name])
? $this->_attributes['filters'][$name]

6
lib/Doctrine/ORM/Query/FilterCollection.php
View File

@ -103,12 +103,14 @@ class FilterCollection
*/
public function enable($name)
{
if (null === $filterClass = $this->config->getFilterClassName($name)) {
if (null === $filter = $this->config->getFilter($name)) {
throw new \InvalidArgumentException("Filter '" . $name . "' does not exist.");
}
if (!isset($this->enabledFilters[$name])) {
$this->enabledFilters[$name] = new $filterClass($this->em);
$this->enabledFilters[$name] = is_object($filter)
? $filter
: new $filter($this->em);
// Keep the enabled filters sorted for the hash
ksort($this->enabledFilters);

4
tests/Doctrine/Tests/ORM/ConfigurationTest.php
View File

@ -230,9 +230,9 @@ class ConfigurationTest extends PHPUnit_Framework_TestCase
public function testAddGetFilters()
{
$this->assertSame(null, $this->configuration->getFilterClassName('NonExistingFilter'));
$this->assertSame(null, $this->configuration->getFilter('NonExistingFilter'));
$this->configuration->addFilter('FilterName', __CLASS__);
$this->assertSame(__CLASS__, $this->configuration->getFilterClassName('FilterName'));
$this->assertSame(__CLASS__, $this->configuration->getFilter('FilterName'));
}
public function setDefaultRepositoryClassName()

20
tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
View File

@ -58,11 +58,27 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
public function testConfigureFilter()
{
$config = new \Doctrine\ORM\Configuration();
$validFilter = $this->getMockBuilder('\Doctrine\ORM\Query\Filter\SQLFilter')
->disableOriginalConstructor()
->getMock();
$config->addFilter("geolocation", $validFilter);
$config->addFilter("locale", "\Doctrine\Tests\ORM\Functional\MyLocaleFilter");
$this->assertEquals("\Doctrine\Tests\ORM\Functional\MyLocaleFilter", $config->getFilterClassName("locale"));
$this->assertNull($config->getFilterClassName("foo"));
$this->assertEquals("\Doctrine\Tests\ORM\Functional\MyLocaleFilter", $config->getFilter("locale"));
$this->assertNull($config->getFilter("foo"));
$this->assertInstanceOf("\Doctrine\ORM\Query\Filter\SQLFilter", $config->getFilter("geolocation"));
}
/**
* @expectedException InvalidArgumentException
*/
public function testConfigureFilterFails()
{
$config = new \Doctrine\ORM\Configuration();
$invalidFilter = $this->getMock('\StdClass');
$config->addFilter("geolocation", $invalidFilter);
}
public function testEntityManagerEnableFilter()