feat: simplify filters - removed filter extensions, registry directly…

… working with container
Kreyu · Feb 10, 2024 · b5edc26 · b5edc26
1 parent 5058deb
commit b5edc26
Show file tree

Hide file tree

Showing 40 changed files with 386 additions and 1,471 deletions.
diff --git a/src/Bridge/Doctrine/Orm/Filter/Extension/DoctrineOrmFilterExtension.php b/src/Bridge/Doctrine/Orm/Filter/Extension/DoctrineOrmFilterExtension.php
diff --git a/src/DataTables.php b/src/DataTables.php
@@ -10,17 +10,9 @@
 use Kreyu\Bundle\DataTableBundle\Exporter\ExporterFactoryBuilder;
 use Kreyu\Bundle\DataTableBundle\Exporter\ExporterFactoryBuilderInterface;
 use Kreyu\Bundle\DataTableBundle\Exporter\ExporterFactoryInterface;
-use Kreyu\Bundle\DataTableBundle\Filter\FilterFactoryBuilder;
-use Kreyu\Bundle\DataTableBundle\Filter\FilterFactoryBuilderInterface;
-use Kreyu\Bundle\DataTableBundle\Filter\FilterFactoryInterface;
 
 final class DataTables
 {
-    public static function createFilterFactory(): FilterFactoryInterface
-    {
-        return self::createFilterFactoryBuilder()->getFilterFactory();
-    }
-
     public static function createActionFactory(): ActionFactoryInterface
     {
         return self::createActionFactoryBuilder()->getActionFactory();
@@ -31,11 +23,6 @@ public static function createExporterFactory(): ExporterFactoryInterface
         return self::createExporterFactoryBuilder()->getExporterFactory();
     }
 
-    public static function createFilterFactoryBuilder(): FilterFactoryBuilderInterface
-    {
-        return new FilterFactoryBuilder();
-    }
-
     public static function createActionFactoryBuilder(): ActionFactoryBuilderInterface
     {
         return new ActionFactoryBuilder();

diff --git a/src/DependencyInjection/KreyuDataTableExtension.php b/src/DependencyInjection/KreyuDataTableExtension.php
@@ -13,7 +13,6 @@
 use Kreyu\Bundle\DataTableBundle\Exporter\Extension\ExporterTypeExtensionInterface;
 use Kreyu\Bundle\DataTableBundle\Exporter\Type\ExporterTypeInterface;
 use Kreyu\Bundle\DataTableBundle\Extension\DataTableTypeExtensionInterface;
-use Kreyu\Bundle\DataTableBundle\Filter\Extension\FilterExtensionInterface;
 use Kreyu\Bundle\DataTableBundle\Filter\Extension\FilterTypeExtensionInterface;
 use Kreyu\Bundle\DataTableBundle\Filter\Type\FilterTypeInterface;
 use Kreyu\Bundle\DataTableBundle\Persistence\PersistenceAdapterInterface;
@@ -34,7 +33,6 @@ class KreyuDataTableExtension extends Extension implements PrependExtensionInter
         DataTableTypeExtensionInterface::class => 'kreyu_data_table.type_extension',
         ColumnTypeInterface::class => 'kreyu_data_table.column.type',
         ColumnTypeExtensionInterface::class => 'kreyu_data_table.column.type_extension',
-        FilterExtensionInterface::class => 'kreyu_data_table.filter.extension',
         FilterTypeInterface::class => 'kreyu_data_table.filter.type',
         FilterTypeExtensionInterface::class => 'kreyu_data_table.filter.type_extension',
         ActionExtensionInterface::class => 'kreyu_data_table.action.extension',

diff --git a/src/Filter/Extension/AbstractFilterExtension.php b/src/Filter/Extension/AbstractFilterExtension.php
diff --git a/src/Filter/Extension/DependencyInjection/DependencyInjectionFilterExtension.php b/src/Filter/Extension/DependencyInjection/DependencyInjectionFilterExtension.php
diff --git a/src/Filter/Extension/FilterExtensionInterface.php b/src/Filter/Extension/FilterExtensionInterface.php
diff --git a/src/Filter/Extension/PreloadedFilterExtension.php b/src/Filter/Extension/PreloadedFilterExtension.php
diff --git a/src/Filter/FilterFactoryBuilder.php b/src/Filter/FilterFactoryBuilder.php
diff --git a/src/Filter/FilterFactoryBuilderInterface.php b/src/Filter/FilterFactoryBuilderInterface.php