Inject services into filter setting

Author: discordier

src/FilterSetting/FilterSettingTypeFactory.php

@@ -22,7 +22,9 @@
 namespace MetaModels\AttributeCheckboxBundle\FilterSetting;
 
 use Doctrine\DBAL\Connection;
+use MetaModels\Filter\FilterUrlBuilder;
 use MetaModels\Filter\Setting\AbstractFilterSettingTypeFactory;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Attribute type factory for published filter settings.
@@ -36,13 +38,32 @@ class FilterSettingTypeFactory extends AbstractFilterSettingTypeFactory
      */
     private $connection;
 
+    /**
+     * The event dispatcher.
+     *
+     * @var EventDispatcherInterface
+     */
+    private $dispatcher;
+
+    /**
+     * The filter URL builder.
+     *
+     * @var FilterUrlBuilder
+     */
+    private $filterUrlBuilder;
+
     /**
      * Create a new instance.
      *
-     * @param Connection $connection Databse connection.
+     * @param Connection                    $connection       The database connection.
+     * @param EventDispatcherInterface|null $dispatcher       The event dispatcher.
+     * @param FilterUrlBuilder|null         $filterUrlBuilder The filter URL builder.
      */
-    public function __construct(Connection $connection)
-    {
+    public function __construct(
+        Connection $connection,
+        EventDispatcherInterface $dispatcher = null,
+        FilterUrlBuilder $filterUrlBuilder = null
+    ) {
         parent::__construct();
 
         $this
@@ -51,17 +72,22 @@ public function __construct(Connection $connection)
             ->setTypeClass(Published::class)
             ->allowAttributeTypes('checkbox');
 
-        $this->connection = $connection;
+        $this->connection       = $connection;
+        $this->dispatcher       = $dispatcher;
+        $this->filterUrlBuilder = $filterUrlBuilder;
     }
 
     /**
      * {@inheritdoc}
      */
     public function createInstance($information, $filterSettings)
     {
-        // $this->typeClass is private and there is no getter...
-        $typeClass = Published::class;
-
-        return new $typeClass($filterSettings, $information, $this->connection);
+        return new Published(
+            $filterSettings,
+            $information,
+            $this->connection,
+            $this->dispatcher,
+            $this->filterUrlBuilder
+        );
     }
 }

src/FilterSetting/Published.php

@@ -24,11 +24,13 @@
 
 use Contao\System;
 use Doctrine\DBAL\Connection;
+use MetaModels\Filter\FilterUrlBuilder;
 use MetaModels\Filter\Setting\ICollection;
 use MetaModels\Filter\Setting\Simple;
 use MetaModels\Filter\IFilter;
 use MetaModels\Filter\Rules\SimpleQuery;
 use MetaModels\Filter\Rules\StaticIdList;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Published setting handler for checkboxes.
@@ -45,15 +47,20 @@ class Published extends Simple
     /**
      * Constructor - initialize the object and store the parameters.
      *
-     * @param ICollection $collection The parenting filter settings object.
-     *
-     * @param array       $data       The attributes for this filter setting.
-     *
-     * @param Connection  $connection The database connection.
+     * @param ICollection                   $collection       The parenting filter settings object.
+     * @param array                         $data             The attributes for this filter setting.
+     * @param Connection                    $connection       The database connection.
+     * @param EventDispatcherInterface|null $dispatcher       The event dispatcher.
+     * @param FilterUrlBuilder|null         $filterUrlBuilder The filter URL builder.
      */
-    public function __construct(ICollection $collection, array $data, Connection $connection = null)
-    {
-        parent::__construct($collection, $data);
+    public function __construct(
+        ICollection $collection,
+        array $data,
+        Connection $connection = null,
+        EventDispatcherInterface $dispatcher = null,
+        FilterUrlBuilder $filterUrlBuilder = null
+    ) {
+        parent::__construct($collection, $data, $dispatcher, $filterUrlBuilder);
 
         if (null === $connection) {
             // @codingStandardsIgnoreStart Silencing errors is discouraged

src/Resources/config/services.yml

@@ -11,5 +11,7 @@ services:
         class: MetaModels\AttributeCheckboxBundle\FilterSetting\FilterSettingTypeFactory
         arguments:
           - '@database_connection'
+          - '@event_dispatcher'
+          - '@MetaModels\Filter\FilterUrlBuilder'
         tags:
           - { name: metamodels.filter_factory }