Merge fed8f97 into cb294a4

Event/ExceptionListener.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace ONGR\FilterManagerBundle\Event;
+
+use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\HttpFoundation\Response;
+
+class ExceptionListener
+{
+    /**
+     * @param Event $event
+     *
+     * @return Response
+     */
+    public function onKernelException(Event $event)
+    {
+        $exception = $event->getException();
+        if ($exception instanceof InvalidArgumentException &&
+            $exception->getMessage() == 'Given value must not be an array'
+        ) {
+            $response = new Response('Given value to the single choice filter must not be an array', 406);
+            $event->setResponse($response);
+        }
+    }
+}

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('Given value must not be an array');
+            }
             $search->addPostFilter(new TermQuery($this->getField(), $state->getValue()));
         }
     }

Resources/config/services.yml

@@ -5,3 +5,7 @@ services:
                 - '@router'
             tags:
                 - { name: twig.extension }
+    ongr_filter_manager.event.exception_listener:
+        class: ONGR\FilterManagerBundle\Event\ExceptionListener
+        tags:
+            - { name: kernel.event_listener, event: kernel.exception, method: onKernelException }

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

@@ -211,4 +211,18 @@ public function testChoicesSize()
 
         $this->assertEquals(11, count($result->getChoices()));
     }
+
+    /**
+     * Tests bad request sent to manager
+     */
+    public function testArrayInRequest()
+    {
+        $client = static::createClient();
+        $crawler = $client->request('GET', '/array_test?single_choice[]=blue+black');
+        $this->assertEquals(406, $client->getResponse()->getStatusCode());
+        $this->assertContains(
+            'Given value to the single choice filter must not be an array',
+            $crawler->html()
+        );
+    }
 }

Tests/app/config/config_test.yml

@@ -62,6 +62,9 @@ ongr_filter_manager:
         range_filters:
             filters: ['date']
             repository: 'es.manager.default.product'
+        single_choice:
+            filters: ['single_choice']
+            repository: 'es.manager.default.product'
     filters:
         match:
             phrase:

Tests/app/config/routing.yml

@@ -13,3 +13,8 @@ app_list_json:
 
 test_page:
     path: /
+
+test_bad_request:
+    path: /array_test
+    defaults:
+        _controller: TestBundle:Test:testSingleChoiceException

Tests/app/fixture/TestBundle/Controller/TestController.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\FilterManagerBundle\Tests\app\fixture\TestBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class TestController extends Controller
+{
+    /**
+     * @param Request $request
+     *
+     * @return Response
+     */
+    public function testSingleChoiceExceptionAction(Request $request)
+    {
+        $manager = $this->get('ongr_filter_manager.single_choice');
+        $result = $manager->handleRequest($request);
+        return new Response($result);
+    }
+}