cleanup di

Author: thomas-kl1

app/code/Magento/Cms/etc/di.xml

@@ -117,14 +117,6 @@
             <argument name="resourceModel" xsi:type="string">Magento\Cms\Model\ResourceModel\Block</argument>
         </arguments>
     </type>
-    <virtualType name="CmsGirdFilterPool" type="Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool">
-        <arguments>
-            <argument name="appliers" xsi:type="array">
-                <item name="regular" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\RegularFilter</item>
-                <item name="fulltext" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter</item>
-            </argument>
-        </arguments>
-    </virtualType>
     <type name="Magento\Framework\Model\Entity\RepositoryFactory">
         <arguments>
             <argument name="entities" xsi:type="array">

app/code/Magento/Sales/etc/di.xml

@@ -819,14 +819,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool">
-        <arguments>
-            <argument name="appliers" xsi:type="array">
-                <item name="regular" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\RegularFilter</item>
-                <item name="fulltext" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
         <arguments>
             <argument name="collections" xsi:type="array">

app/code/Magento/Search/etc/di.xml

@@ -45,14 +45,6 @@
     <preference for="Magento\Search\Model\AutocompleteInterface" type="Magento\Search\Model\Autocomplete" />
     <preference for="Magento\Search\Model\Autocomplete\ItemInterface" type="Magento\Search\Model\Autocomplete\Item" />
     <preference for="Magento\Framework\Search\SearchEngineInterface" type="Magento\Search\Model\SearchEngine"/>
-    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool">
-        <arguments>
-            <argument name="appliers" xsi:type="array">
-                <item name="regular" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\RegularFilter</item>
-                <item name="fulltext" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter</item>
-            </argument>
-        </arguments>
-    </type>
     <!-- @api -->
     <virtualType name="Magento\Search\Model\ResourceModel\Synonyms\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
         <arguments>

app/code/Magento/Ui/etc/di.xml

@@ -194,13 +194,11 @@
             <argument name="uiReader" xsi:type="object">uiDefinitionReader</argument>
         </arguments>
     </type>
-    <type name="Magento\Ui\Component\Filter\FilterPool">
+    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool">
         <arguments>
-            <argument name="filters" xsi:type="array">
-                <item name="filter_input" xsi:type="string">Magento\Ui\Component\Filter\Type\Input</item>
-                <item name="filter_select" xsi:type="string">Magento\Ui\Component\Filter\Type\Select</item>
-                <item name="filter_range" xsi:type="string">Magento\Ui\Component\Filter\Type\Range</item>
-                <item name="filter_store" xsi:type="string">Magento\Ui\Component\Filter\Type\Store</item>
+            <argument name="appliers" xsi:type="array">
+                <item name="regular" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\RegularFilter</item>
+                <item name="fulltext" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter</item>
             </argument>
         </arguments>
     </type>

lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\View\Element\UiComponent\DataProvider;
 
@@ -17,12 +18,12 @@
 class FilterPool
 {
     /**
-     * @var array
+     * @var FilterApplierInterface[]
      */
     protected $appliers;
 
     /**
-     * @param array $appliers
+     * @param FilterApplierInterface[] $appliers
      */
     public function __construct(array $appliers = [])
     {
@@ -38,12 +39,7 @@ public function applyFilters(Collection $collection, SearchCriteriaInterface $cr
     {
         foreach ($criteria->getFilterGroups() as $filterGroup) {
             foreach ($filterGroup->getFilters() as $filter) {
-                /** @var $filterApplier FilterApplierInterface*/
-                if (isset($this->appliers[$filter->getConditionType()])) {
-                    $filterApplier = $this->appliers[$filter->getConditionType()];
-                } else {
-                    $filterApplier = $this->appliers['regular'];
-                }
+                $filterApplier = $this->appliers[$filter->getConditionType()] ?? $this->appliers['regular'];
                 $filterApplier->apply($collection, $filter);
             }
         }