Remove no longer used annotation use statements and replace with attribute use statements

This commit is contained in:
2025-10-01 18:38:41 +02:00
parent d8528dceab
commit 32d2bb002b
486 changed files with 495 additions and 1063 deletions

View File

@@ -13,8 +13,6 @@ namespace Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
use Doctrine\ORM\Event\PrePersistEventArgs;
use Doctrine\ORM\Event\PreUpdateEventArgs;
/**
* This service listens for preUpdate and prePersist events on some entities

View File

@@ -59,11 +59,6 @@ class EntityPersonCRUDController extends CRUDController
/**
* Add a where clause to the buildQuery.
*
* @param string $action
* @param QueryBuilder $qb
* @param Request $request
* @return QueryBuilder
*/
protected function filterQueryEntitiesByPerson(string $action, QueryBuilder $qb, Request $request): QueryBuilder
{

View File

@@ -30,17 +30,14 @@ use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Doctrine\Persistence\ManagerRegistry;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Serializer\Exception\RuntimeException;
use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Component\Validator\ConstraintViolationListInterface;
use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -55,8 +52,7 @@ final class AccompanyingCourseApiController extends ApiController
private readonly Registry $registry,
private readonly ValidatorInterface $validator,
private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository,
) {
}
) {}
public function commentApi($id, Request $request, string $_format): Response
{
@@ -141,7 +137,7 @@ final class AccompanyingCourseApiController extends ApiController
/**
* @ParamConverter("person", options={"id": "person_id"})
*/
public function getAccompanyingPeriodsByPerson(Person $person): \Symfony\Component\HttpFoundation\JsonResponse
public function getAccompanyingPeriodsByPerson(Person $person): JsonResponse
{
$accompanyingPeriods = $person->getCurrentAccompanyingPeriods();
$accompanyingPeriodsChecked = array_filter(
@@ -152,7 +148,7 @@ final class AccompanyingCourseApiController extends ApiController
return $this->json(\array_values($accompanyingPeriodsChecked), Response::HTTP_OK, [], ['groups' => ['read']]);
}
public function participationApi($id, Request $request, $_format): \Symfony\Component\HttpFoundation\JsonResponse
public function participationApi($id, Request $request, $_format): JsonResponse
{
/** @var AccompanyingPeriod $accompanyingPeriod */
$accompanyingPeriod = $this->getEntity('participation', $id, $request);
@@ -285,7 +281,7 @@ final class AccompanyingCourseApiController extends ApiController
* @ParamConverter("accompanyingCourse", options={"id": "id"})
*/
#[\Symfony\Component\Routing\Attribute\Route(path: '/api/1.0/person/accompanying-course/{id}/confidential.json', name: 'chill_api_person_accompanying_period_confidential')]
public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, mixed $id, Request $request): \Symfony\Component\HttpFoundation\JsonResponse
public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, mixed $id, Request $request): JsonResponse
{
if ('POST' === $request->getMethod()) {
$this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL, $accompanyingCourse);
@@ -302,7 +298,7 @@ final class AccompanyingCourseApiController extends ApiController
* @ParamConverter("accompanyingCourse", options={"id": "id"})
*/
#[\Symfony\Component\Routing\Attribute\Route(path: '/api/1.0/person/accompanying-course/{id}/intensity.json', name: 'chill_api_person_accompanying_period_intensity')]
public function toggleIntensityApi(AccompanyingPeriod $accompanyingCourse, Request $request): \Symfony\Component\HttpFoundation\JsonResponse
public function toggleIntensityApi(AccompanyingPeriod $accompanyingCourse, Request $request): JsonResponse
{
if ('POST' === $request->getMethod()) {
$this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_INTENSITY, $accompanyingCourse);

View File

@@ -26,7 +26,6 @@ use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
class AccompanyingCourseCommentController extends AbstractController

View File

@@ -25,7 +25,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Validator\ConstraintViolationInterface;
use Symfony\Component\Validator\ConstraintViolationListInterface;
@@ -98,7 +97,7 @@ final class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle
* @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
*/
#[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/parcours/{accompanying_period_id}/delete', name: 'chill_person_accompanying_course_delete')]
public function deleteAction(Request $request, AccompanyingPeriod $accompanyingCourse): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
public function deleteAction(Request $request, AccompanyingPeriod $accompanyingCourse): \Symfony\Component\HttpFoundation\RedirectResponse|Response
{
$em = $this->managerRegistry->getManager();

View File

@@ -19,7 +19,6 @@ use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepos
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
class AccompanyingCourseWorkApiController extends ApiController

View File

@@ -27,7 +27,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

View File

@@ -15,7 +15,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluatio
use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
class AccompanyingCourseWorkEvaluationDocumentController extends AbstractController

View File

@@ -41,7 +41,7 @@ class AccompanyingPeriodController extends AbstractController
private readonly ValidatorInterface $validator,
private readonly TranslatorInterface $translator,
private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
private readonly RequestStack $requestStack
private readonly RequestStack $requestStack,
) {}
/**

View File

@@ -26,7 +26,6 @@ use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
class AccompanyingPeriodRegulationListController

View File

@@ -19,7 +19,7 @@ use Chill\PersonBundle\Service\AccompanyingPeriodWork\AccompanyingPeriodWorkMerg
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Translation\TranslatableMessage;
use Symfony\Contracts\Translation\TranslatorInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;

View File

@@ -22,7 +22,6 @@ use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvalu
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
use Symfony\Component\Serializer\SerializerInterface;

View File

@@ -20,7 +20,6 @@ use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
use Symfony\Component\Serializer\SerializerInterface;

View File

@@ -12,7 +12,6 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Routing\Annotation\Route;
/**
* Class AdminController.
@@ -43,9 +42,6 @@ class AdminController extends AbstractController
return $this->render('@ChillPerson/Admin/indexSocialWork.html.twig');
}
/**
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
#[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/person_redirect_to_main', name: 'chill_person_admin_redirect_to_admin_index', options: [null])]
public function redirectToAdminIndexAction(): \Symfony\Component\HttpFoundation\RedirectResponse
{

View File

@@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Request;
*/
class ClosingMotiveController extends CRUDController
{
// public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {}
// public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {}
/**
* @param string $action

View File

@@ -22,13 +22,10 @@ use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
use Chill\PersonBundle\Repository\Household\HouseholdACLAwareRepositoryInterface;
use Chill\PersonBundle\Repository\Household\HouseholdRepository;
use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
use Doctrine\Persistence\ManagerRegistry;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
class HouseholdApiController extends ApiController
@@ -37,8 +34,7 @@ class HouseholdApiController extends ApiController
private readonly EventDispatcherInterface $eventDispatcher,
private readonly HouseholdRepository $householdRepository,
private readonly HouseholdACLAwareRepositoryInterface $householdACLAwareRepository,
) {
}
) {}
/**
* @return \Symfony\Component\HttpFoundation\JsonResponse

View File

@@ -26,7 +26,6 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Bundle\SecurityBundle\Security;

View File

@@ -23,7 +23,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
use Symfony\Component\Serializer\SerializerInterface;

View File

@@ -21,19 +21,17 @@ use Chill\PersonBundle\Repository\Household\PositionRepository;
use Chill\PersonBundle\Repository\PersonRepository;
use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
use Chill\PersonBundle\Security\Authorization\PersonVoter;
use Doctrine\Persistence\ManagerRegistry;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Serializer\Exception;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\Routing\Attribute\Route;
class HouseholdMemberController extends ApiController
{
@@ -52,7 +50,7 @@ class HouseholdMemberController extends ApiController
$this->household_fields_visibility = $parameterBag->get('chill_person.household_fields');
}
#[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/household/member/{id}/edit', name: 'chill_person_household_member_edit')]
#[Route(path: '/{_locale}/person/household/member/{id}/edit', name: 'chill_person_household_member_edit')]
public function editMembership(Request $request, HouseholdMember $member): Response
{
// TODO ACL
@@ -91,8 +89,8 @@ class HouseholdMemberController extends ApiController
* * allow_leave_without_household: if present, the editor will allow
* to leave household without joining another
*/
#[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/household/members/editor', name: 'chill_person_household_members_editor')]
public function editor(Request $request): \Symfony\Component\HttpFoundation\Response
#[Route(path: '/{_locale}/person/household/members/editor', name: 'chill_person_household_members_editor')]
public function editor(Request $request): Response
{
$ids = $request->query->all('persons');
@@ -170,7 +168,7 @@ class HouseholdMemberController extends ApiController
]);
}
#[\Symfony\Component\Routing\Attribute\Route(path: '/api/1.0/person/household/members/move.{_format}', name: 'chill_api_person_household_members_move')]
#[Route(path: '/api/1.0/person/household/members/move.{_format}', name: 'chill_api_person_household_members_move')]
public function move(Request $request, mixed $_format): Response
{
try {

View File

@@ -24,7 +24,7 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Translation\TranslatableMessage;
use Twig\Environment;

View File

@@ -109,7 +109,7 @@ final class PersonResourceController extends AbstractController
}
#[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/{person_id}/resources/list', name: 'chill_person_resource_list')]
public function listAction(Request $request, mixed $person_id): \Symfony\Component\HttpFoundation\Response
public function listAction(Request $request, mixed $person_id): Response
{
$personOwner = $this->personRepository->find($person_id);
$this->denyAccessUnlessGranted(PersonVoter::SEE, $personOwner);
@@ -127,7 +127,7 @@ final class PersonResourceController extends AbstractController
}
#[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/{person_id}/resources/new', name: 'chill_person_resource_new')]
public function newAction(Request $request, mixed $person_id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
public function newAction(Request $request, mixed $person_id): \Symfony\Component\HttpFoundation\RedirectResponse|Response
{
$personOwner = $this->personRepository->find($person_id);
$personResource = new PersonResource();

View File

@@ -17,7 +17,6 @@ use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Security\Authorization\PersonVoter;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
class PersonSignatureController extends AbstractController
{

View File

@@ -32,7 +32,6 @@ use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Validator\Constraints\NotIdenticalTo;
use Symfony\Component\Validator\Constraints\NotNull;

View File

@@ -21,7 +21,6 @@ use Symfony\Component\Form\Extension\Core\Type\FormType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

View File

@@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
class SocialActionCSVExportController extends AbstractController

View File

@@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Bundle\SecurityBundle\Security;
class SocialIssueCSVExportController extends AbstractController

View File

@@ -18,7 +18,6 @@ use Chill\PersonBundle\Entity\SocialWork\SocialAction;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
class SocialWorkEvaluationApiController extends AbstractController
{

View File

@@ -28,7 +28,7 @@ final class SocialWorkSocialActionApiController extends ApiController
private readonly ClockInterface $clock,
) {}
public function listBySocialIssueApi($id, Request $request): \Symfony\Component\HttpFoundation\JsonResponse
public function listBySocialIssueApi($id, Request $request): JsonResponse
{
$socialIssue = $this->socialIssueRepository
->find($id);

View File

@@ -105,7 +105,7 @@ class UserAccompanyingPeriodController extends AbstractController
]);
}
#[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/accompanying-periods/my/drafts', name: 'chill_person_accompanying_period_draft_user')]
#[Route(path: '/{_locale}/person/accompanying-periods/my/drafts', name: 'chill_person_accompanying_period_draft_user')]
public function listDraftsAction(): Response
{
$total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => 'DRAFT']);

View File

@@ -25,7 +25,7 @@ class Configuration implements ConfigurationInterface
.' any birthdate is not allowed. The birthdate is expressed as ISO8601 : '
.'https://en.wikipedia.org/wiki/ISO_8601#Durations';
public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder
public function getConfigTreeBuilder(): TreeBuilder
{
$treeBuilder = new TreeBuilder('cl_chill_person');
$rootNode = $treeBuilder->getRootNode();

View File

@@ -44,8 +44,8 @@ use Doctrine\Common\Collections\Order;
use Doctrine\Common\Collections\ReadableCollection;
use Doctrine\Common\Collections\Selectable;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
use Symfony\Component\Serializer\Attribute\Groups;
use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
use Symfony\Component\Validator\GroupSequenceProviderInterface;
@@ -631,7 +631,7 @@ class AccompanyingPeriod implements
return $this->getOpenParticipations();
}
public function getGroupSequence(): \Symfony\Component\Validator\Constraints\GroupSequence|array
public function getGroupSequence(): Assert\GroupSequence|array
{
if (self::STEP_DRAFT === $this->getStep()) {
return [[self::STEP_DRAFT]];

View File

@@ -28,7 +28,7 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ReadableCollection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
use Symfony\Component\Validator\Constraints as Assert;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_work' => AccompanyingPeriodWork::class])]

View File

@@ -18,7 +18,7 @@ use Chill\PersonBundle\Entity\SocialWork\Evaluation;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_work_evaluation' => AccompanyingPeriodWorkEvaluation::class])]
#[ORM\Entity]
@@ -140,7 +140,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
/**
* @return Collection<AccompanyingPeriodWorkEvaluationDocument>
*/
public function getDocuments(): \Doctrine\Common\Collections\Collection
public function getDocuments(): Collection
{
return $this->documents;
}

View File

@@ -16,7 +16,7 @@ use Chill\DocStoreBundle\Entity\StoredObject;
use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
use Symfony\Component\Validator\Constraints as Assert;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_work_evaluation_document' => AccompanyingPeriodWorkEvaluationDocument::class])]

View File

@@ -16,7 +16,7 @@ use Chill\PersonBundle\Entity\SocialWork\Result;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_work_goal' => AccompanyingPeriodWorkGoal::class])]
#[ORM\Entity]

View File

@@ -14,7 +14,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
/**
* ClosingMotive give an explanation why we closed the Accompanying period.
@@ -81,8 +81,6 @@ class ClosingMotive
/**
* Get id.
*
* @return int
*/
public function getId(): ?int
{
@@ -91,8 +89,6 @@ class ClosingMotive
/**
* Get name.
*
* @return array
*/
public function getName(): array
{
@@ -104,10 +100,7 @@ class ClosingMotive
return $this->ordering;
}
/**
* @return ClosingMotive
*/
public function getParent(): ?\Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive
public function getParent(): ?ClosingMotive
{
return $this->parent;
}

View File

@@ -16,8 +16,8 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
use Symfony\Component\Serializer\Attribute\Groups;
use Symfony\Component\Validator\Constraints as Assert;
#[DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_comment' => Comment::class])]

View File

@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['origin' => Origin::class])]
#[ORM\Entity]

View File

@@ -15,8 +15,8 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person;
use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
use Symfony\Component\Serializer\Attribute\Groups;
/**
* **About denormalization**: this operation is operated by @see{AccompanyingPeriodResourdeNormalizer}.

View File

@@ -12,8 +12,8 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
use Symfony\Component\Serializer\Attribute\Groups;
/**
* AccompanyingPeriodParticipation Class.

View File

@@ -13,7 +13,7 @@ namespace Chill\PersonBundle\Entity;
use Chill\PersonBundle\Repository\AdministrativeStatusRepository;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['chill_person_administrative_status' => AdministrativeStatus::class])]
#[ORM\Entity(repositoryClass: AdministrativeStatusRepository::class)]

View File

@@ -13,7 +13,7 @@ namespace Chill\PersonBundle\Entity;
use Chill\PersonBundle\Repository\EmploymentStatusRepository;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['chill_person_employment_status' => EmploymentStatus::class])]
#[ORM\Entity(repositoryClass: EmploymentStatusRepository::class)]

View File

@@ -23,7 +23,7 @@ use Doctrine\Common\Collections\ReadableCollection;
use Doctrine\Common\Collections\Selectable;
use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Component\Validator\Context\ExecutionContextInterface;

View File

@@ -17,7 +17,7 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
use Symfony\Component\Validator\Constraints as Assert;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['household_composition_type' => HouseholdCompositionType::class])]

View File

@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Entity\Household;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['household_composition_type' => HouseholdCompositionType::class])]
#[ORM\Entity]

View File

@@ -13,7 +13,7 @@ namespace Chill\PersonBundle\Entity\Household;
use Chill\PersonBundle\Entity\Person;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
use Symfony\Component\Validator\Constraints as Assert;
#[ORM\Entity]

View File

@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Entity\Household;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['household_position' => Position::class])]
#[ORM\Entity]

View File

@@ -47,7 +47,7 @@ use Doctrine\Common\Collections\ReadableCollection;
use Doctrine\Common\Collections\Selectable;
use Doctrine\ORM\Mapping as ORM;
use libphonenumber\PhoneNumber;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -1175,7 +1175,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
*
* @throws \Exception
*/
public function getLastAddress(?\DateTime $from = null): ?\Chill\MainBundle\Entity\Address
public function getLastAddress(?\DateTime $from = null): ?Address
{
return $this->getCurrentHouseholdAddress(
null !== $from ? \DateTimeImmutable::createFromMutable($from) : null
@@ -1288,7 +1288,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
*
* @return Collection<Language>
*/
public function getSpokenLanguages(): \Doctrine\Common\Collections\Collection
public function getSpokenLanguages(): Collection
{
return $this->spokenLanguages;
}

View File

@@ -20,7 +20,7 @@ use Chill\PersonBundle\Entity\Person;
use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute\Groups;
use Symfony\Component\Validator\Constraints as Assert;
#[ORM\MappedSuperclass]

View File

@@ -14,8 +14,8 @@ namespace Chill\PersonBundle\Entity\Person;
use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute as Serializer;
use Symfony\Component\Serializer\Attribute\Groups;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['personResource' => PersonResource::class])]
#[ORM\Entity]

View File

@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Entity\Person;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[ORM\Entity]
#[ORM\Table(name: 'chill_person_resource_kind')]

View File

@@ -17,8 +17,9 @@ use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Repository\ResidentialAddressRepository;
use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\Context;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute\Context;
use Symfony\Component\Serializer\Attribute\Groups;
#[ORM\Entity(repositoryClass: ResidentialAddressRepository::class)]
#[ORM\Table(name: 'chill_person_residential_address')]

View File

@@ -12,7 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute\Groups;
/**
* PersonAltName.
@@ -39,8 +39,6 @@ class PersonAltName
/**
* Get id.
*
* @return int
*/
public function getId(): ?int
{
@@ -49,8 +47,6 @@ class PersonAltName
/**
* Get key.
*
* @return string
*/
public function getKey(): string
{
@@ -59,8 +55,6 @@ class PersonAltName
/**
* Get label.
*
* @return string
*/
public function getLabel(): string
{

View File

@@ -56,17 +56,17 @@ class PersonNotDuplicate
return $this->id;
}
public function getPerson1(): ?\Chill\PersonBundle\Entity\Person
public function getPerson1(): ?Person
{
return $this->person1;
}
public function getPerson2(): ?\Chill\PersonBundle\Entity\Person
public function getPerson2(): ?Person
{
return $this->person2;
}
public function getUser(): ?\Chill\MainBundle\Entity\User
public function getUser(): ?User
{
return $this->user;
}

View File

@@ -12,8 +12,8 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Entity\Relationships;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Attribute as Serializer;
use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
#[DiscriminatorMap(typeProperty: 'type', mapping: ['relation' => Relation::class])]
#[ORM\Entity]

View File

@@ -20,8 +20,8 @@ use Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicat
use Doctrine\ORM\Mapping as ORM;
use Doctrine\ORM\Mapping\DiscriminatorColumn;
use RuntimeException;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Attribute as Serializer;
use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
use Symfony\Component\Validator\Constraints as Assert;
#[DiscriminatorMap(typeProperty: 'type', mapping: ['relationship' => Relationship::class])]

View File

@@ -14,7 +14,7 @@ namespace Chill\PersonBundle\Entity\SocialWork;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['social_work_evaluation' => Evaluation::class])]
#[ORM\Entity]

View File

@@ -14,7 +14,7 @@ namespace Chill\PersonBundle\Entity\SocialWork;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['social_work_goal' => Goal::class])]
#[ORM\Entity]

View File

@@ -16,7 +16,7 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['social_work_result' => Result::class])]
#[ORM\Entity]

View File

@@ -15,7 +15,7 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ReadableCollection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Attribute as Serializer;
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['social_work_social_action' => SocialAction::class])]
#[ORM\Entity]

View File

@@ -15,8 +15,8 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
use Symfony\Component\Serializer\Attribute\Groups;
#[DiscriminatorMap(typeProperty: 'type', mapping: ['social_issue' => SocialIssue::class])]
#[ORM\Entity]

View File

@@ -19,9 +19,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
class AccompanyingCourseCommentType extends AbstractType
{
/**
* @return void
*/
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder->add('content', ChillTextareaType::class, [
@@ -30,9 +27,6 @@ class AccompanyingCourseCommentType extends AbstractType
]);
}
/**
* @return void
*/
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefault('class', Comment::class);

View File

@@ -108,9 +108,6 @@ class AccompanyingPeriodType extends AbstractType
->setAllowedTypes('center', Center::class);
}
/**
* @return string
*/
public function getBlockPrefix(): string
{
return 'chill_personbundle_accompanyingperiod';

View File

@@ -47,8 +47,6 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
/**
* @param null $value
*
* @return array
*/
public function loadChoicesForValues(array $values, $value = null): array
{

View File

@@ -119,9 +119,6 @@ final class CreationPersonType extends AbstractType
]);
}
/**
* @return string
*/
public function getBlockPrefix(): string
{
return self::NAME;

View File

@@ -26,9 +26,6 @@ class PersonConfimDuplicateType extends AbstractType
]);
}
/**
* @return string
*/
public function getBlockPrefix(): string
{
return 'chill_personbundle_person_confirm_duplicate';

View File

@@ -30,9 +30,6 @@ class PersonFindManuallyDuplicateType extends AbstractType
]);
}
/**
* @return string
*/
public function getBlockPrefix(): string
{
return 'chill_personbundle_person_find_manually_duplicate';

View File

@@ -70,9 +70,6 @@ class ClosingMotivePickerType extends AbstractType
->getActiveClosingMotive($options['only_leaf']));
}
/**
* @return string
*/
public function getBlockPrefix(): string
{
return 'closing_motive';

View File

@@ -51,8 +51,6 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
/**
* @param array{person: Person} $parameters
*
* @return void
*/
public function buildMenu($menuId, MenuItem $menu, array $parameters): void
{

View File

@@ -57,18 +57,12 @@ class PrivacyEvent extends \Symfony\Contracts\EventDispatcher\Event
return $this;
}
/**
* @return array
*/
public function getArgs(): array
{
return $this->args;
}
/**
* @return Person
*/
public function getPerson(): \Chill\PersonBundle\Entity\Person
public function getPerson(): Person
{
return $this->person;
}

View File

@@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
use Symfony\Component\Workflow\Registry;
class AccompanyingPeriodWorkEvaluationNormalizer implements \Symfony\Component\Serializer\Normalizer\NormalizerInterface, NormalizerAwareInterface
class AccompanyingPeriodWorkEvaluationNormalizer implements NormalizerInterface, NormalizerAwareInterface
{
use NormalizerAwareTrait;
@@ -71,4 +71,3 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements \Symfony\Component\S
return 'json' === $format ? [AccompanyingPeriodWorkEvaluation::class => true] : [];
}
}

View File

@@ -142,4 +142,3 @@ class AccompanyingPeriodWorkNormalizer implements \Symfony\Component\Serializer\
};
}
}

View File

@@ -103,4 +103,3 @@ class SocialActionNormalizer implements NormalizerAwareInterface, NormalizerInte
return [];
}
}

View File

@@ -84,4 +84,3 @@ class SocialIssueNormalizer implements NormalizerInterface, NormalizerAwareInter
return [];
}
}

View File

@@ -32,7 +32,7 @@ final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_administrative_location');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\AdministrativeLocationAggregator
public function getAggregator(): AdministrativeLocationAggregator
{
return $this->aggregator;
}

View File

@@ -36,7 +36,7 @@ class ClosingDateAggregatorTest extends AbstractAggregatorTest
self::$entityManager = self::getContainer()->get(EntityManagerInterface::class);
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingDateAggregator
public function getAggregator(): ClosingDateAggregator
{
return self::$closingDateAggregator;
}

View File

@@ -32,7 +32,7 @@ final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_closingmotive');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingMotiveAggregator
public function getAggregator(): ClosingMotiveAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class ConfidentialAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_confidential');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ConfidentialAggregator
public function getAggregator(): ConfidentialAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class DurationAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_duration');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\DurationAggregator
public function getAggregator(): DurationAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class EmergencyAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_emergency');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EmergencyAggregator
public function getAggregator(): EmergencyAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class EvaluationAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_evaluation');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EvaluationAggregator
public function getAggregator(): EvaluationAggregator
{
return $this->aggregator;
}

View File

@@ -34,7 +34,7 @@ final class GeographicalUnitStatAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_geographicalunitstat');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\GeographicalUnitStatAggregator
public function getAggregator(): GeographicalUnitStatAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class IntensityAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_intensity');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\IntensityAggregator
public function getAggregator(): IntensityAggregator
{
return $this->aggregator;
}

View File

@@ -36,7 +36,7 @@ class OpeningDateAggregatorTest extends AbstractAggregatorTest
self::$entityManager = self::getContainer()->get(EntityManagerInterface::class);
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\OpeningDateAggregator
public function getAggregator(): OpeningDateAggregator
{
return self::$openingDateAggregator;
}

View File

@@ -32,7 +32,7 @@ final class OriginAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_origin');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\OriginAggregator
public function getAggregator(): OriginAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class PersonParticipatingAggregatorTest extends AbstractAggregatorTest
$this->labelPersonHelper = self::getContainer()->get(LabelPersonHelper::class);
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\PersonParticipatingAggregator
public function getAggregator(): PersonParticipatingAggregator
{
return new PersonParticipatingAggregator($this->labelPersonHelper);
}

View File

@@ -34,7 +34,7 @@ final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
{
use ProphecyTrait;
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerScopeAggregator
public function getAggregator(): ReferrerScopeAggregator
{
$translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
$translatableStringHelper->localize(Argument::type('array'))->willReturn('localized');

View File

@@ -32,7 +32,7 @@ final class RequestorAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_requestor');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\RequestorAggregator
public function getAggregator(): RequestorAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_referrer_scope');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeAggregator
public function getAggregator(): ScopeAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class SocialActionAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_socialaction');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialActionAggregator
public function getAggregator(): SocialActionAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class SocialIssueAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_socialissue');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialIssueAggregator
public function getAggregator(): SocialIssueAggregator
{
return $this->aggregator;
}

View File

@@ -33,7 +33,7 @@ final class StepAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_step');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\StepAggregator
public function getAggregator(): StepAggregator
{
return $this->aggregator;
}

View File

@@ -36,7 +36,7 @@ class ByClosingMotiveAggregatorTest extends AbstractAggregatorTest
$this->closingMotiveRepository = self::getContainer()->get(ClosingMotiveRepositoryInterface::class);
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByClosingMotiveAggregator
public function getAggregator(): ByClosingMotiveAggregator
{
return new ByClosingMotiveAggregator(
$this->closingMotiveRepository,

View File

@@ -24,7 +24,7 @@ use Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregator
*/
class ByDateAggregatorTest extends AbstractAggregatorTest
{
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByDateAggregator
public function getAggregator(): ByDateAggregator
{
return new ByDateAggregator();
}

View File

@@ -24,7 +24,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
*/
class ByStepAggregatorTest extends AbstractAggregatorTest
{
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByStepAggregator
public function getAggregator(): ByStepAggregator
{
$translator = new class () implements TranslatorInterface {
public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string

View File

@@ -32,7 +32,7 @@ final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_evaluationtype');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\EvaluationAggregators\EvaluationTypeAggregator
public function getAggregator(): EvaluationTypeAggregator
{
return $this->aggregator;
}

View File

@@ -33,7 +33,7 @@ final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_household_childrennumber');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\ChildrenNumberAggregator
public function getAggregator(): ChildrenNumberAggregator
{
return $this->aggregator;
}

View File

@@ -33,7 +33,7 @@ final class CompositionAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_household_composition');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\CompositionAggregator
public function getAggregator(): CompositionAggregator
{
return $this->aggregator;
}

View File

@@ -33,7 +33,7 @@ final class AgeAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_age');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\PersonAggregators\AgeAggregator
public function getAggregator(): AgeAggregator
{
return $this->aggregator;
}

View File

@@ -32,7 +32,7 @@ final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
$this->aggregator = self::getContainer()->get('chill.person.export.aggregator_country_of_birth');
}
public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\PersonAggregators\CountryOfBirthAggregator
public function getAggregator(): CountryOfBirthAggregator
{
return $this->aggregator;
}

Some files were not shown because too many files have changed in this diff Show More