Merge pull request #174 from einorler/issue153

implemented exception when array given to choice

Author: saimaz

Filter/Widget/Choice/SingleTermChoice.php

@@ -11,6 +11,7 @@
 
 namespace ONGR\FilterManagerBundle\Filter\Widget\Choice;
 
+use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
 use ONGR\ElasticsearchDSL\Aggregation\FilterAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\TermsAggregation;
 use ONGR\ElasticsearchDSL\Query\TermQuery;
@@ -60,6 +61,9 @@ public function getSortType()
     public function modifySearch(Search $search, FilterState $state = null, SearchRequest $request = null)
     {
         if ($state && $state->isActive()) {
+            if (is_array($state->getValue())) {
+                throw new InvalidArgumentException('Value given to `SingleTermChoice` filter must not be an array');
+            }
             $search->addPostFilter(new TermQuery($this->getField(), $state->getValue()));
         }
     }

Tests/Functional/Filter/Widget/Choice/SingleTermChoiceTest.php

@@ -211,4 +211,17 @@ public function testChoicesSize()
 
         $this->assertEquals(11, count($result->getChoices()));
     }
+
+    /**
+     * Tests bad request sent to manager
+     */
+    public function testArrayValueException()
+    {
+        $client = static::createClient();
+        $crawler = $client->request('GET', '/list?single_choice[]=blue+black');
+        $this->assertContains(
+            'Value given to `SingleTermChoice` filter must not be an array',
+            $crawler->html()
+        );
+    }
 }

Tests/app/config/config_test.yml

@@ -54,7 +54,7 @@ ongr_elasticsearch:
 ongr_filter_manager:
     managers:
         foo_filters:
-            filters: ['phrase', 'single_choice', 'foo_range']
+            filters: ['phrase', 'single_choice', 'foo_range', 'single_choice']
             repository: 'es.manager.default.product'
         bar_filters:
             filters: ['sort', 'inclusive_range', 'bar_range']