Merge pull request #28 from beeldspraak/add-alias-option-filter

add alias option for filter

Filter/CallbackFilter.php

@@ -20,7 +20,7 @@ class CallbackFilter extends Filter
      */
     protected function association($queryBuilder, $data)
     {
-        return array($queryBuilder->getRootAlias(), false);
+        return array($this->getOption('alias', $queryBuilder->getRootAlias()), false);
     }
 
     /**

Filter/Filter.php

@@ -26,7 +26,7 @@ abstract class Filter extends BaseFilter
 
     protected function association($queryBuilder, $value)
     {
-        return array($queryBuilder->getRootAlias(), $this->getFieldName());
+        return array($this->getOption('alias', $queryBuilder->getRootAlias()), $this->getFieldName());
     }
 
     protected function applyWhere($queryBuilder, $parameter)

Tests/Filter/FilterTest.php

@@ -41,6 +41,11 @@ class FilterTest_Filter extends Filter
             'options' => $this->getFieldOptions()
         ));
     }
+
+    public function testAssociation($queryBuilder, $value)
+    {
+        return $this->association($queryBuilder, $value);
+    }
 }
 
 class FilterTest extends \PHPUnit_Framework_TestCase
@@ -71,6 +76,21 @@ class FilterTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(42, $filter->getValue());
     }
 
+    public function testAliasOption()
+    {
+        $filter = new FilterTest_Filter();
+
+        $filter->initialize('field_name', array('alias' => 'association_alias', 'field_name' => 'field_name'));
+
+        $this->assertEquals('association_alias', $filter->getOption('alias'));
+
+        $builder = new QueryBuilder;
+        $this->assertEquals(array('association_alias', 'field_name'), $filter->testAssociation($builder, 'value'));
+
+        $filter->initialize('field_name', array('field_name' => 'field_name'));
+        $this->assertEquals(array($builder->getRootAlias(), 'field_name'), $filter->testAssociation($builder, 'value'));
+    }
+
     /**
      * @expectedException RuntimeException
      */