rename filters to avoid confusion

This commit is contained in:
Julie Lenaerts 2022-07-27 16:02:11 +02:00
parent ab2b2bc235
commit a40e2de91d
3 changed files with 10 additions and 18 deletions

View File

@ -11,8 +11,6 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Export\Filter;
use Chill\CustomFieldsBundle\Form\Type\ChoicesType;
use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Entity\UserJob;
use Chill\MainBundle\Export\FilterInterface;
@ -20,23 +18,17 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\Query\Expr\Andx;
use Doctrine\ORM\QueryBuilder;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface;
class UserJobFilter implements FilterInterface
class CurrentUserJobFilter implements FilterInterface
{
/**
* @var TranslatorInterface
*/
protected $translator;
protected TranslatorInterface $translator;
private Security $security;
/**
* @var TranslatableStringHelper
*/
private TranslatableStringHelper $translatableStringHelper;
public function __construct(

View File

@ -24,7 +24,7 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface;
class UserScopeFilter implements FilterInterface
class CurrentUserScopeFilter implements FilterInterface
{
/**
* @var TranslatorInterface

View File

@ -32,19 +32,19 @@ services:
- { name: chill.export, alias: avg_accompanyingcourse_duration }
## Filters
chill.person.export.filter_userscope:
class: Chill\PersonBundle\Export\Filter\UserScopeFilter
chill.person.export.filter_current_userscope:
class: Chill\PersonBundle\Export\Filter\CurrentUserScopeFilter
autowire: true
autoconfigure: true
tags:
- { name: chill.export_filter, alias: accompanyingcourse_userscope_filter }
- { name: chill.export_filter, alias: accompanyingcourse_current_userscope_filter }
chill.person.export.filter_userjob:
class: Chill\PersonBundle\Export\Filter\UserJobFilter
chill.person.export.filter_current_userjob:
class: Chill\PersonBundle\Export\Filter\CurrentUserJobFilter
autowire: true
autoconfigure: true
tags:
- { name: chill.export_filter, alias: accompanyingcourse_userjob_filter }
- { name: chill.export_filter, alias: accompanyingcourse_current_userjob_filter }
chill.person.export.filter_socialissue:
class: Chill\PersonBundle\Export\Filter\SocialIssueFilter