Merge branch 'hotfix/deprecations' into 'release/2.3.0'

Fix deprecations in filter factories See merge request metamodels/core!339
MetaModels · Sep 25, 2024 · 5ed64dc · 5ed64dc
2 parents fb64e0f + 2b79797
commit 5ed64dc
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 25 deletions.
diff --git a/src/CoreBundle/Resources/config/filter-settings.yml b/src/CoreBundle/Resources/config/filter-settings.yml
@@ -1,6 +1,10 @@
 services:
     metamodels.filter_setting_factory.idlist:
         class: MetaModels\Filter\Setting\StaticIdListFilterSettingTypeFactory
+        arguments:
+          - '@event_dispatcher'
+          - '@MetaModels\Filter\FilterUrlBuilder'
+          - '@translator'
         tags:
           - { name: metamodels.filter_factory }
 
@@ -9,6 +13,7 @@ services:
         arguments:
           - '@event_dispatcher'
           - '@MetaModels\Filter\FilterUrlBuilder'
+          - '@translator'
         tags:
           - { name: metamodels.filter_factory }
 
@@ -34,10 +39,18 @@ services:
 
     metamodels.filter_setting_factory.conditionand:
         class: MetaModels\Filter\Setting\ConditionAndFilterSettingTypeFactory
+        arguments:
+          - '@event_dispatcher'
+          - '@MetaModels\Filter\FilterUrlBuilder'
+          - '@translator'
         tags:
           - { name: metamodels.filter_factory }
 
     metamodels.filter_setting_factory.conditionor:
         class: MetaModels\Filter\Setting\ConditionOrFilterSettingTypeFactory
+        arguments:
+          - '@event_dispatcher'
+          - '@MetaModels\Filter\FilterUrlBuilder'
+          - '@translator'
         tags:
           - { name: metamodels.filter_factory }
diff --git a/src/Filter/Setting/ConditionAndFilterSettingTypeFactory.php b/src/Filter/Setting/ConditionAndFilterSettingTypeFactory.php
@@ -21,7 +21,10 @@
 
 namespace MetaModels\Filter\Setting;
 
+use MetaModels\Filter\FilterUrlBuilder;
 use MetaModels\Filter\Setting\Condition\ConditionAnd;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Attribute type factory for AND filter settings.
@@ -31,8 +34,11 @@ class ConditionAndFilterSettingTypeFactory extends AbstractFilterSettingTypeFact
     /**
      * {@inheritDoc}
      */
-    public function __construct()
-    {
+    public function __construct(
+        private readonly EventDispatcherInterface $dispatcher,
+        private readonly FilterUrlBuilder $filterUrlBuilder,
+        private readonly TranslatorInterface $translator,
+    ) {
         parent::__construct();
 
         $this
@@ -41,4 +47,18 @@ public function __construct()
             ->setTypeClass(ConditionAnd::class)
             ->allowAttributeTypes();
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createInstance($information, $filterSettings)
+    {
+        return new ConditionAnd(
+            $filterSettings,
+            $information,
+            $this->dispatcher,
+            $this->filterUrlBuilder,
+            $this->translator
+        );
+    }
 }
diff --git a/src/Filter/Setting/ConditionOrFilterSettingTypeFactory.php b/src/Filter/Setting/ConditionOrFilterSettingTypeFactory.php
@@ -21,7 +21,10 @@
 
 namespace MetaModels\Filter\Setting;
 
+use MetaModels\Filter\FilterUrlBuilder;
 use MetaModels\Filter\Setting\Condition\ConditionOr;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Attribute type factory for OR filter settings.
@@ -31,8 +34,11 @@ class ConditionOrFilterSettingTypeFactory extends AbstractFilterSettingTypeFacto
     /**
      * {@inheritDoc}
      */
-    public function __construct()
-    {
+    public function __construct(
+        private readonly EventDispatcherInterface $dispatcher,
+        private readonly FilterUrlBuilder $filterUrlBuilder,
+        private readonly TranslatorInterface $translator,
+    ) {
         parent::__construct();
 
         $this
@@ -41,4 +47,18 @@ public function __construct()
             ->setTypeClass(ConditionOr::class)
             ->allowAttributeTypes();
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createInstance($information, $filterSettings)
+    {
+        return new ConditionOr(
+            $filterSettings,
+            $information,
+            $this->dispatcher,
+            $this->filterUrlBuilder,
+            $this->translator
+        );
+    }
 }
diff --git a/src/Filter/Setting/SimpleLookupFilterSettingTypeFactory.php b/src/Filter/Setting/SimpleLookupFilterSettingTypeFactory.php
@@ -22,30 +22,21 @@
 
 use MetaModels\Filter\FilterUrlBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Attribute type factory for simple lookup filter settings.
  */
 class SimpleLookupFilterSettingTypeFactory extends AbstractFilterSettingTypeFactory
 {
-    /**
-     * The event dispatcher.
-     *
-     * @var EventDispatcherInterface
-     */
-    private $dispatcher;
-
-    /**
-     * The filter URL builder.
-     *
-     * @var FilterUrlBuilder
-     */
-    private $filterUrlBuilder;
-
     /**
      * {@inheritDoc}
      */
-    public function __construct(EventDispatcherInterface $dispatcher, FilterUrlBuilder $filterUrlBuilder)
+    public function __construct(
+        private readonly EventDispatcherInterface $dispatcher,
+        private readonly FilterUrlBuilder $filterUrlBuilder,
+        private readonly TranslatorInterface $translator,
+    )
     {
         parent::__construct();
 
@@ -54,16 +45,19 @@ public function __construct(EventDispatcherInterface $dispatcher, FilterUrlBuild
             ->setTypeIcon('bundles/metamodelscore/images/icons/filter_default.png')
             ->setTypeClass(SimpleLookup::class)
             ->allowAttributeTypes();
-
-        $this->dispatcher       = $dispatcher;
-        $this->filterUrlBuilder = $filterUrlBuilder;
     }
 
     /**
      * {@inheritdoc}
      */
     public function createInstance($information, $filterSettings)
     {
-        return new SimpleLookup($filterSettings, $information, $this->dispatcher, $this->filterUrlBuilder);
+        return new SimpleLookup(
+            $filterSettings,
+            $information,
+            $this->dispatcher,
+            $this->filterUrlBuilder,
+            $this->translator
+        );
     }
 }
diff --git a/src/Filter/Setting/StaticIdListFilterSettingTypeFactory.php b/src/Filter/Setting/StaticIdListFilterSettingTypeFactory.php
@@ -21,6 +21,10 @@
 
 namespace MetaModels\Filter\Setting;
 
+use MetaModels\Filter\FilterUrlBuilder;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
 /**
  * Attribute type factory for static id list filter settings.
  */
@@ -29,13 +33,30 @@ class StaticIdListFilterSettingTypeFactory extends AbstractFilterSettingTypeFact
     /**
      * {@inheritDoc}
      */
-    public function __construct()
-    {
+    public function __construct(
+        private readonly EventDispatcherInterface $dispatcher,
+        private readonly FilterUrlBuilder $filterUrlBuilder,
+        private readonly TranslatorInterface $translator,
+    ) {
         parent::__construct();
 
         $this
             ->setTypeName('idlist')
             ->setTypeIcon('bundles/metamodelscore/images/icons/filter_default.png')
             ->setTypeClass(IdList::class);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createInstance($information, $filterSettings)
+    {
+        return new IdList(
+            $filterSettings,
+            $information,
+            $this->dispatcher,
+            $this->filterUrlBuilder,
+            $this->translator
+        );
+    }
 }