diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index c38e6e2..ffd1108 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -17,12 +17,10 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder(): TreeBuilder { - $treeBuilder = new TreeBuilder('padam87_form_filter'); - // Here you should define the parameters that are allowed to // configure your bundle. See the documentation linked above for // more information on that topic. - return $treeBuilder; + return new TreeBuilder('padam87_form_filter'); } } diff --git a/DependencyInjection/Padam87FormFilterExtension.php b/DependencyInjection/Padam87FormFilterExtension.php index 11c5572..eca10d7 100644 --- a/DependencyInjection/Padam87FormFilterExtension.php +++ b/DependencyInjection/Padam87FormFilterExtension.php @@ -2,10 +2,10 @@ namespace Padam87\FormFilterBundle\DependencyInjection; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\DependencyInjection\Loader; /** * This is the class that loads and manages your bundle configuration. @@ -20,9 +20,9 @@ class Padam87FormFilterExtension extends Extension public function load(array $configs, ContainerBuilder $container): void { $configuration = new Configuration(); - $config = $this->processConfiguration($configuration, $configs); + $this->processConfiguration($configuration, $configs); - $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); } } diff --git a/Form/RangeFilterType.php b/Form/RangeFilterType.php index 6ef4965..5dad973 100644 --- a/Form/RangeFilterType.php +++ b/Form/RangeFilterType.php @@ -4,8 +4,6 @@ use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\Extension\Core\Type\ChoiceType; -use Symfony\Component\Form\Extension\Core\Type\DateType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\Options; @@ -42,26 +40,24 @@ public function configureOptions(OptionsResolver $resolver): void 'to_field_type' => TextType::class, 'to_field_options' => [], 'to_field_expr' => 'lte', - 'filter' => function (Options $options) { - return function(QueryBuilder $qb, string $alias, array $value, string $field) use ($options): void { - if ($value['from'] != null) { - $parameter = $this->getParameterName($alias, $field, 'from'); + 'filter' => fn(Options $options) => function(QueryBuilder $qb, string $alias, array $value, string $field) use ($options): void { + if ($value['from'] != null) { + $parameter = $this->getParameterName($alias, $field, 'from'); - $qb - ->andWhere($qb->expr()->{$options['from_field_expr']}($alias . '.' . $field, ':' . $parameter)) - ->setParameter($parameter, $value['from']) - ; - } - - if ($value['to'] != null) { - $parameter = $this->getParameterName($alias, $field, 'to'); + $qb + ->andWhere($qb->expr()->{$options['from_field_expr']}($alias . '.' . $field, ':' . $parameter)) + ->setParameter($parameter, $value['from']) + ; + } + + if ($value['to'] != null) { + $parameter = $this->getParameterName($alias, $field, 'to'); - $qb - ->andWhere($qb->expr()->{$options['to_field_expr']}($alias . '.' . $field, ':' . $parameter)) - ->setParameter($parameter, $value['to']) - ; - } - }; + $qb + ->andWhere($qb->expr()->{$options['to_field_expr']}($alias . '.' . $field, ':' . $parameter)) + ->setParameter($parameter, $value['to']) + ; + } }, ] ) diff --git a/Service/Filters.php b/Service/Filters.php index fb124ef..1324aae 100644 --- a/Service/Filters.php +++ b/Service/Filters.php @@ -9,7 +9,7 @@ class Filters { public function apply(QueryBuilder $qb, FormInterface $filters, ?string $rootAlias = null): void { - $rootAlias = $rootAlias ?? $qb->getRootAliases()[0]; + $rootAlias ??= $qb->getRootAliases()[0]; foreach ($filters->all() as $name => $filter) { $ignoreNull = $filter->getConfig()->getOption('filter_ignore_null'); diff --git a/composer.json b/composer.json index 48af961..5a6c06c 100644 --- a/composer.json +++ b/composer.json @@ -19,12 +19,10 @@ "psr-4": {"Padam87\\FormFilterBundle\\": ""} }, "require": { - "php": "^8.0", - "symfony/config": "^6.0 || ^7.0", - "symfony/dependency-injection": "^6.0 || ^7.0", - "symfony/form": "^6.0 || ^7.0", - "doctrine/orm": "^2.3 || ^3.0" - }, - "suggest": { + "php": "^8.4", + "symfony/config": "^6.0 || ^7.0 || ^8.0", + "symfony/dependency-injection": "^6.0 || ^7.0 || ^8.0", + "symfony/form": "^6.0 || ^7.0 || ^8.0", + "doctrine/orm": "^2.3 || ^3.0 || ^8.0" } }