Skip to content

Commit 0cea97d

Browse files
committed
Merge pull request #125 from symfony2admingenerator/fix-param-key_move
Move getParamName to DoctrineQueryFilter
2 parents cb788fe + 0c3de59 commit 0cea97d

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

QueryFilter/BaseQueryFilter.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,6 @@ abstract class BaseQueryFilter implements QueryFilterInterface
66
{
77
protected $query;
88

9-
protected $paramNumber = 0;
10-
11-
/**
12-
* (non-PHPdoc)
13-
* @see GeneratorBundle\QueryFilter.QueryFilterInterface::getParamName()
14-
*/
15-
public function getParamName($field)
16-
{
17-
return $field.'_'.$this->paramNumber++;
18-
}
19-
209
/**
2110
* (non-PHPdoc)
2211
* @see GeneratorBundle\QueryFilter.QueryFilterInterface::setQuery()

QueryFilter/DoctrineQueryFilter.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44

55
class DoctrineQueryFilter extends BaseQueryFilter
66
{
7+
/**
8+
* @var integer
9+
*/
10+
protected $paramNumber = 0;
11+
12+
/**
13+
* @param string $field Table field name.
14+
* @return string Param key unique name.
15+
*/
16+
public function getParamName($field)
17+
{
18+
return $field.'_'.$this->paramNumber++;
19+
}
20+
721
public function addDefaultFilter($field, $value)
822
{
923
$paramName = $this->getParamName($field);

QueryFilter/QueryFilterInterface.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@
44

55
interface QueryFilterInterface
66
{
7-
/**
8-
* @param string $field Field name
9-
*
10-
* @api
11-
*/
12-
public function getParamName($field);
13-
147
/**
158
* @param object $query the query object interface depend of the ORM
169
*

0 commit comments

Comments
 (0)