Merge pull request #41 from martiis/master

Unique filter names validation in configuration.

Author: linasmo

DependencyInjection/ONGRFilterManagerExtension.php

@@ -11,6 +11,7 @@
 
 namespace ONGR\FilterManagerBundle\DependencyInjection;
 
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Definition;
@@ -51,6 +52,7 @@ private function addFilters(array $config, ContainerBuilder $container)
         }
 
         $filterMap = $container->getParameter('ongr_filter_manager.filter_map');
+        $this->validateFilterNames($config['filters']);
 
         foreach ($config['filters'] as $type => $filters) {
             foreach ($filters as $name => $filter) {
@@ -82,6 +84,30 @@ private function addFilters(array $config, ContainerBuilder $container)
         }
     }
 
+    /**
+     * Checks if filter names are valid.
+     *
+     * @param array $filters Filters to validate.
+     *
+     * @throws InvalidConfigurationException
+     */
+    private function validateFilterNames(array $filters)
+    {
+        $existing = [];
+
+        foreach ($filters as $type => $filters) {
+            foreach ($filters as $name => $data) {
+                if (in_array($name, $existing)) {
+                    throw new InvalidConfigurationException(
+                        "Found duplicate filter name `{$name}` in `{$type}` filter"
+                    );
+                }
+
+                $existing[] = $name;
+            }
+        }
+    }
+
     /**
      * Adds filters managers based on configuration.
      *

Tests/Unit/DependencyInjection/ONGRFilterManagerExtensionTest.php

@@ -167,6 +167,35 @@ public function testWithEmptyConfiguration()
         }
     }
 
+    /**
+     * Tests if exception is thrown when filter names are duplicated.
+     *
+     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage Found duplicate filter name `test_sorting` in `match` filter
+     */
+    public function testConfigWithDuplicateNameException()
+    {
+        $config = array_replace_recursive(
+            $this->getDummyConfig(),
+            [
+                'ongr_filter_manager' => [
+                    'filters' => [
+                        'match' => [
+                            'test_sorting' => [
+                                'request_field' => 'test_q',
+                                'field' => 'test_title',
+                            ],
+                        ],
+                    ],
+                ],
+            ]
+        );
+
+        $container = new ContainerBuilder();
+        $extension = new ONGRFilterManagerExtension();
+        $extension->load($config, $container);
+    }
+
     /**
      * Returns dummy configuration for testing.
      *
@@ -188,8 +217,7 @@ protected function getDummyConfig($relations = [])
                 ],
                 'filters' => [
                     'sort' => [
-                        'test_sorting' =>
-                        [
+                        'test_sorting' => [
                             'relations' => $relations,
                             'request_field' => 'sort',
                             'choices' => [