Merge pull request #82 from martiis/filter_check_hotfix

First part of and operation has to be false to drop instantly

Author: GrandLTU

DependencyInjection/Compiler/FilterPass.php

@@ -35,20 +35,18 @@ public function process(ContainerBuilder $container)
 
             foreach ($container->findTaggedServiceIds('ongr_filter_manager.filter') as $filterId => $filterTags) {
                 foreach ($filterTags as $tag) {
-                    if (!array_key_exists('manager', $tag)
-                        && $managerId != ONGRFilterManagerExtension::getFilterServiceId($tag['manager'])
+                    if (array_key_exists('manager', $tag)
+                        && $managerId === ONGRFilterManagerExtension::getFilterManagerId($tag['manager'])
                     ) {
-                        continue;
-                    }
-                    
-                    if (!array_key_exists('filter_name', $tag)) {
-                        throw new InvalidConfigurationException(
-                            sprintf('Filter tagged with `%s` must have `filter_name` parameter set.', $filterId)
-                        );
-                    }
+                        if (!array_key_exists('filter_name', $tag)) {
+                            throw new InvalidConfigurationException(
+                                sprintf('Filter tagged with `%s` must have `filter_name` set.', $filterId)
+                            );
+                        }
 
-                    $this->addFilter($managerDefinition, $tag['filter_name'], $filterId);
-                    $container->setDefinition($managerId, $managerDefinition);
+                        $this->addFilter($managerDefinition, $tag['filter_name'], $filterId);
+                        $container->setDefinition($managerId, $managerDefinition);
+                    }
                 }
             }
             $this->checkManager($managerDefinition, "Manager '{$managerId}' does not have any filters.");
@@ -74,7 +72,7 @@ private function addFilter($manager, $filterName, $filterId)
         );
         $manager->replaceArgument(0, $filtersContainer);
     }
-    
+
     /**
      * Checks if manager definition has any filters set.
      *

DependencyInjection/ONGRFilterManagerExtension.php

@@ -58,15 +58,27 @@ public function addFilterFactory(AbstractFilterFactory $factory)
     /**
      * Formats filter service id from given name.
      *
-     * @param string $name Filter manager name.
+     * @param string $name Filter name.
      *
      * @return string
      */
-    public static function getFilterServiceId($name)
+    public static function getFilterId($name)
     {
         return sprintf('ongr_filter_manager.filter.%s', $name);
     }
 
+    /**
+     * Formats filter manager service id from given name.
+     *
+     * @param string $name Filter manager name.
+     *
+     * @return string
+     */
+    public static function getFilterManagerId($name)
+    {
+        return sprintf('ongr_filter_manager.%s', $name);
+    }
+
     /**
      * Adds filters based on configuration.
      *
@@ -89,7 +101,7 @@ private function addFilters(array $config, ContainerBuilder $container)
                 $this->addRelation($filterDefinition, $config, 'reset', 'include');
                 $this->addRelation($filterDefinition, $config, 'reset', 'exclude');
 
-                $container->setDefinition(self::getFilterServiceId($name), $filterDefinition);
+                $container->setDefinition(self::getFilterId($name), $filterDefinition);
             }
         }
     }
@@ -132,7 +144,7 @@ private function addFiltersManagers(array $config, ContainerBuilder $container)
             foreach ($manager['filters'] as $filter) {
                 $filtersContainer->addMethodCall(
                     'set',
-                    [$filter, new Reference(self::getFilterServiceId($filter))]
+                    [$filter, new Reference(self::getFilterId($filter))]
                 );
             }
 
@@ -145,7 +157,7 @@ private function addFiltersManagers(array $config, ContainerBuilder $container)
             );
             $managerDefinition->addTag('es.filter_manager');
 
-            $container->setDefinition(sprintf('ongr_filter_manager.%s', $name), $managerDefinition);
+            $container->setDefinition(self::getFilterManagerId($name), $managerDefinition);
         }
     }