filter-bundle huh.filter.registry to huh.filter.manager renaming fix

heimrichhannot · Mar 21, 2018 · 9070e24 · 9070e24
1 parent afb5fdb
commit 9070e24
Show file tree

Hide file tree

Showing 9 changed files with 213 additions and 60 deletions.
diff --git a/src/Backend/Module.php b/src/Backend/Module.php
@@ -47,7 +47,7 @@ public function getFieldsByListModule(DataContainer $dc)
             return [];
         }
 
-        if (null === ($filterConfig = System::getContainer()->get('huh.filter.registry')->findById($listConfig->filter))) {
+        if (null === ($filterConfig = System::getContainer()->get('huh.filter.manager')->findById($listConfig->filter))) {
             return [];
         }
 

diff --git a/src/Lists/DefaultList.php b/src/Lists/DefaultList.php
@@ -126,7 +126,7 @@ public function parse(string $listTemplate = null, string $itemTemplate = null,
 
         // apply filter
         /** @var FilterQueryBuilder $queryBuilder */
-        $queryBuilder = $this->_manager->getFilterRegistry()->getQueryBuilder($filter->id);
+        $queryBuilder = $this->_manager->getFilterManager()->getQueryBuilder($filter->id);
 
         $this->setIsSubmitted($isSubmitted);
 

diff --git a/src/Manager/ListManager.php b/src/Manager/ListManager.php
@@ -13,7 +13,7 @@
 use Contao\DataContainer;
 use Contao\System;
 use HeimrichHannot\FilterBundle\Config\FilterConfig;
-use HeimrichHannot\FilterBundle\Registry\FilterRegistry;
+use HeimrichHannot\FilterBundle\Manager\FilterManager;
 use HeimrichHannot\ListBundle\Lists\ListInterface;
 use HeimrichHannot\ListBundle\Model\ListConfigModel;
 use HeimrichHannot\ListBundle\Registry\ListConfigElementRegistry;
@@ -48,9 +48,9 @@ class ListManager implements ListManagerInterface
     protected $listConfigElementRegistry;
 
     /**
-     * @var FilterRegistry
+     * @var FilterManager
      */
-    protected $filterRegistry;
+    protected $filterManager;
 
     /**
      * @var Request
@@ -106,7 +106,7 @@ public function __construct(
         ContaoFrameworkInterface $framework,
         ListConfigRegistry $listConfigRegistry,
         ListConfigElementRegistry $listConfigElementRegistry,
-        FilterRegistry $filterRegistry,
+        FilterManager $filterManager,
         Request $request,
         ModelUtil $modelUtil,
         UrlUtil $urlUtil,
@@ -115,18 +115,18 @@ public function __construct(
         FormUtil $formUtil,
         \Twig_Environment $twig
     ) {
-        $this->framework = $framework;
-        $this->listConfigRegistry = $listConfigRegistry;
+        $this->framework                 = $framework;
+        $this->listConfigRegistry        = $listConfigRegistry;
         $this->listConfigElementRegistry = $listConfigElementRegistry;
-        $this->filterRegistry = $filterRegistry;
-        $this->request = $request;
-        $this->modelUtil = $modelUtil;
-        $this->urlUtil = $urlUtil;
-        $this->formUtil = $formUtil;
-        $this->containerUtil = $containerUtil;
-        $this->imageUtil = $imageUtil;
-        $this->twig = $twig;
-        $this->database = $framework->createInstance(Database::class);
+        $this->filterManager             = $filterManager;
+        $this->request                   = $request;
+        $this->modelUtil                 = $modelUtil;
+        $this->urlUtil                   = $urlUtil;
+        $this->formUtil                  = $formUtil;
+        $this->containerUtil             = $containerUtil;
+        $this->imageUtil                 = $imageUtil;
+        $this->twig                      = $twig;
+        $this->database                  = $framework->createInstance(Database::class);
     }
 
     /**
@@ -318,7 +318,7 @@ public function getFilterConfig(): FilterConfig
     {
         $filterId = $this->getListConfig()->filter;
 
-        if (!$filterId || null === ($filterConfig = System::getContainer()->get('huh.filter.registry')->findById($filterId))) {
+        if (!$filterId || null === ($filterConfig = System::getContainer()->get('huh.filter.manager')->findById($filterId))) {
             throw new \Exception(sprintf('The module %s has no valid filter. Please set one.', $this->moduleData['id']));
         }
 
@@ -342,18 +342,18 @@ public function setRequest(Request $request)
     }
 
     /**
-     * @return FilterRegistry
+     * @return FilterManager
      */
-    public function getFilterRegistry(): FilterRegistry
+    public function getFilterManager(): FilterManager
     {
-        return $this->filterRegistry;
+        return $this->filterManager;
     }
 
     /**
-     * @param FilterRegistry $filterRegistry
+     * @param FilterManager $filterManager
      */
-    public function setFilterRegistry(FilterRegistry $filterRegistry)
+    public function setFilterManager(FilterManager $filterManager)
     {
-        $this->filterRegistry = $filterRegistry;
+        $this->filterManager = $filterManager;
     }
 }
diff --git a/src/Manager/ListManagerInterface.php b/src/Manager/ListManagerInterface.php
@@ -10,7 +10,7 @@
 
 use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
 use HeimrichHannot\FilterBundle\Config\FilterConfig;
-use HeimrichHannot\FilterBundle\Registry\FilterRegistry;
+use HeimrichHannot\FilterBundle\Manager\FilterManager;
 use HeimrichHannot\ListBundle\Lists\ListInterface;
 use HeimrichHannot\ListBundle\Model\ListConfigModel;
 use HeimrichHannot\ListBundle\Registry\ListConfigElementRegistry;
@@ -147,12 +147,12 @@ public function getRequest();
     public function setRequest(Request $request);
 
     /**
-     * @return FilterRegistry
+     * @return FilterManager
      */
-    public function getFilterRegistry(): FilterRegistry;
+    public function getFilterManager(): FilterManager;
 
     /**
-     * @param FilterRegistry $filterRegistry
+     * @param FilterManager $filterRegistry
      */
-    public function setFilterRegistry(FilterRegistry $filterRegistry);
+    public function setFilterManager(FilterManager $filterRegistry);
 }
diff --git a/src/Module/ModuleList.php b/src/Module/ModuleList.php
@@ -14,6 +14,7 @@
 use Contao\ModuleModel;
 use Contao\System;
 use HeimrichHannot\FilterBundle\Config\FilterConfig;
+use HeimrichHannot\FilterBundle\Manager\FilterManager;
 use HeimrichHannot\ListBundle\Lists\ListInterface;
 use HeimrichHannot\ListBundle\Manager\ListManagerInterface;
 use HeimrichHannot\ListBundle\Model\ListConfigModel;
@@ -45,6 +46,11 @@ class ModuleList extends Module
      */
     protected $filterConfig;
 
+    /**
+     * @var FilterManager
+     */
+    protected $filterManager;
+
     /**
      * @var ListConfigRegistry
      */
@@ -76,7 +82,7 @@ public function __construct(ModuleModel $objModule, $strColumn = 'main')
         System::loadLanguageFile('tl_list_config');
 
         $this->listConfigRegistry = System::getContainer()->get('huh.list.list-config-registry');
-        $this->filterRegistry = System::getContainer()->get('huh.filter.registry');
+        $this->filterManager = System::getContainer()->get('huh.filter.manager');
         $this->request = System::getContainer()->get('huh.request');
 
         // retrieve list config

diff --git a/src/Registry/ListConfigRegistry.php b/src/Registry/ListConfigRegistry.php
@@ -87,7 +87,7 @@ public function getFilterByPk(int $listConfigPk)
             return null;
         }
 
-        if (!$listConfig->filter || null === ($filterConfig = System::getContainer()->get('huh.filter.registry')->findById($listConfig->filter))) {
+        if (!$listConfig->filter || null === ($filterConfig = System::getContainer()->get('huh.filter.manager')->findById($listConfig->filter))) {
             return null;
         }
 

diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -17,7 +17,7 @@ services:
             - "@contao.framework"
             - "@huh.list.list-config-registry"
             - "@huh.list.list-config-element-registry"
-            - "@huh.filter.registry"
+            - "@huh.filter.manager"
             - "@huh.request"
             - "@huh.utils.model"
             - "@huh.utils.url"

diff --git a/tests/Fixtures/library/Config.php b/tests/Fixtures/library/Config.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Contao\Fixtures;
+
+class Config
+{
+    private static $instance;
+
+    protected function __construct()
+    {
+        $GLOBALS['TL_CONFIG']['timeZone'] = 'GMT';
+        $GLOBALS['TL_CONFIG']['characterSet'] = 'UTF-8';
+    }
+
+    public static function getInstance()
+    {
+        if (null === static::$instance) {
+            static::$instance = new static();
+        }
+
+        return static::$instance;
+    }
+
+    public static function set($key, $value)
+    {
+        $GLOBALS['TL_CONFIG'][$key] = $value;
+    }
+
+    public static function get($key)
+    {
+        if (isset($GLOBALS['TL_CONFIG'][$key])) {
+            return $GLOBALS['TL_CONFIG'][$key];
+        }
+
+        return null;
+    }
+
+    public static function has($key)
+    {
+        return array_key_exists($key, $GLOBALS['TL_CONFIG']);
+    }
+
+    public static function preload()
+    {
+        // ignore
+    }
+
+    public static function isComplete()
+    {
+        return true;
+    }
+}