diff --git a/package.json b/package.json index a24c4ee8f..e2b8d8ba3 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "@hotwired/stimulus": "^3.0.0", "@luminateone/eslint-baseline": "^1.0.9", "@symfony/stimulus-bridge": "^3.2.0", + "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets", "@symfony/webpack-encore": "^4.1.0", "@tsconfig/node20": "^20.1.4", "@types/dompurify": "^3.0.5", diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php index eb5812b4d..3e8604b4f 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php @@ -15,6 +15,7 @@ use Chill\CalendarBundle\Repository\CalendarRepository; use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Serializer\Model\Collection; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -23,7 +24,10 @@ use Symfony\Component\Routing\Annotation\Route; class CalendarAPIController extends ApiController { - public function __construct(private readonly CalendarRepository $calendarRepository) {} + public function __construct(private readonly CalendarRepository $calendarRepository, ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } #[Route(path: '/api/1.0/calendar/calendar/by-user/{id}.{_format}', name: 'chill_api_single_calendar_list_by-user', requirements: ['_format' => 'json'])] public function listByUser(User $user, Request $request, string $_format): JsonResponse diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php index 3774f4226..c460aac0b 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php @@ -15,6 +15,7 @@ use Chill\CalendarBundle\Repository\CalendarRangeRepository; use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Serializer\Model\Collection; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -23,7 +24,10 @@ use Symfony\Component\Routing\Annotation\Route; class CalendarRangeAPIController extends ApiController { - public function __construct(private readonly CalendarRangeRepository $calendarRangeRepository) {} + public function __construct(private readonly CalendarRangeRepository $calendarRangeRepository, ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } #[Route(path: '/api/1.0/calendar/calendar-range-available/{id}.{_format}', name: 'chill_api_single_calendar_range_available', requirements: ['_format' => 'json'])] public function availableRanges(User $user, Request $request, string $_format): JsonResponse diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php index b67298f4c..5d9382802 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php @@ -14,6 +14,7 @@ namespace Chill\DocStoreBundle\Controller; use Chill\DocStoreBundle\Entity\StoredObject; use Chill\MainBundle\CRUD\Controller\ApiController; use Doctrine\ORM\EntityManagerInterface; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\Routing\Annotation\Route; @@ -27,7 +28,10 @@ class StoredObjectApiController extends ApiController private readonly Security $security, private readonly SerializerInterface $serializer, private readonly EntityManagerInterface $entityManager, - ) {} + ManagerRegistry $managerRegistry, + ) { + parent::__construct($managerRegistry); + } /** * Creates a new stored object. diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php index ea5e55a69..b877d0624 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php +++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php @@ -39,6 +39,10 @@ abstract class AbstractCRUDController extends AbstractController */ protected array $crudConfig = []; + public function __construct(protected ManagerRegistry $managerRegistry) + { + } + /** * get the role given from the config. */ @@ -213,7 +217,7 @@ abstract class AbstractCRUDController extends AbstractController protected function getManagerRegistry(): ManagerRegistry { - return $this->container->get(ManagerRegistry::class); + return $this->managerRegistry; } /** diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php index 6533da243..afb23187d 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php +++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php @@ -13,6 +13,7 @@ namespace Chill\MainBundle\CRUD\Controller; use Chill\MainBundle\Pagination\PaginatorInterface; use Chill\MainBundle\Serializer\Model\Collection; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; @@ -23,6 +24,11 @@ use Symfony\Component\Validator\ConstraintViolationListInterface; class ApiController extends AbstractCRUDController { + public function __construct(ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + /** * Base method for handling api action. * diff --git a/src/Bundle/ChillMainBundle/Controller/AddressApiController.php b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php index 5ea68cdbc..e78dd8ba8 100644 --- a/src/Bundle/ChillMainBundle/Controller/AddressApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php @@ -13,6 +13,7 @@ namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Entity\Address; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -20,7 +21,10 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; class AddressApiController extends ApiController { - public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {} + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } /** * Duplicate an existing address. diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php index e50cea6bb..03c82ae71 100644 --- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php +++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php @@ -17,6 +17,7 @@ use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Pagination\PaginatorInterface; use Chill\MainBundle\Repository\AddressReferenceRepository; use Chill\MainBundle\Serializer\Model\Collection; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -26,7 +27,10 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; final class AddressReferenceAPIController extends ApiController { - public function __construct(private readonly AddressReferenceRepository $addressReferenceRepository, private readonly PaginatorFactory $paginatorFactory) {} + public function __construct(private readonly AddressReferenceRepository $addressReferenceRepository, private readonly PaginatorFactory $paginatorFactory, ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } #[Route(path: '/api/1.0/main/address-reference/by-postal-code/{id}/search.json')] public function search(PostalCode $postalCode, Request $request): JsonResponse diff --git a/src/Bundle/ChillMainBundle/Controller/CivilityApiController.php b/src/Bundle/ChillMainBundle/Controller/CivilityApiController.php index 36ed5d89c..78cd01ef4 100644 --- a/src/Bundle/ChillMainBundle/Controller/CivilityApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/CivilityApiController.php @@ -13,10 +13,16 @@ namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Pagination\PaginatorInterface; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; class CivilityApiController extends ApiController { + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format) { return $query->addOrderBy('e.order', 'ASC'); diff --git a/src/Bundle/ChillMainBundle/Controller/CountryApiController.php b/src/Bundle/ChillMainBundle/Controller/CountryApiController.php index 12e5258fd..8b74666a4 100644 --- a/src/Bundle/ChillMainBundle/Controller/CountryApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/CountryApiController.php @@ -12,5 +12,12 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; -class CountryApiController extends ApiController {} +class CountryApiController extends ApiController +{ + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } +} diff --git a/src/Bundle/ChillMainBundle/Controller/GenderApiController.php b/src/Bundle/ChillMainBundle/Controller/GenderApiController.php index 96fae4024..85795781e 100644 --- a/src/Bundle/ChillMainBundle/Controller/GenderApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/GenderApiController.php @@ -13,10 +13,16 @@ namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Pagination\PaginatorInterface; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; class GenderApiController extends ApiController { + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + protected function customizeQuery(string $action, Request $request, $query): void { $query diff --git a/src/Bundle/ChillMainBundle/Controller/GeographicalUnitApiController.php b/src/Bundle/ChillMainBundle/Controller/GeographicalUnitApiController.php index 19a1da160..abea89e5d 100644 --- a/src/Bundle/ChillMainBundle/Controller/GeographicalUnitApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/GeographicalUnitApiController.php @@ -12,5 +12,12 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; -class GeographicalUnitApiController extends ApiController {} +class GeographicalUnitApiController extends ApiController +{ + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } +} diff --git a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php index c5b9cd74f..58c55beae 100644 --- a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php @@ -14,6 +14,7 @@ namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Pagination\PaginatorInterface; use Doctrine\ORM\QueryBuilder; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; /** @@ -21,6 +22,11 @@ use Symfony\Component\HttpFoundation\Request; */ class LocationApiController extends ApiController { + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + protected function customizeQuery(string $action, Request $request, $query): void { $query diff --git a/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php index bd86d72dd..527d7ffa6 100644 --- a/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; /** @@ -19,6 +20,11 @@ use Symfony\Component\HttpFoundation\Request; */ class LocationTypeApiController extends ApiController { + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + public function customizeQuery(string $action, Request $request, $query): void { $query->andWhere( diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php index cd13ad455..0ad8ad7f9 100644 --- a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php +++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php @@ -16,6 +16,7 @@ use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Repository\CountryRepository; use Chill\MainBundle\Repository\PostalCodeRepositoryInterface; use Chill\MainBundle\Serializer\Model\Collection; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -26,7 +27,10 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; final class PostalCodeAPIController extends ApiController { - public function __construct(private readonly CountryRepository $countryRepository, private readonly PostalCodeRepositoryInterface $postalCodeRepository, private readonly PaginatorFactory $paginatorFactory) {} + public function __construct(private readonly CountryRepository $countryRepository, private readonly PostalCodeRepositoryInterface $postalCodeRepository, private readonly PaginatorFactory $paginatorFactory, ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } #[Route(path: '/api/1.0/main/postal-code/search.json')] public function search(Request $request): JsonResponse diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeApiController.php b/src/Bundle/ChillMainBundle/Controller/ScopeApiController.php index 85041f0f3..4b6d1d348 100644 --- a/src/Bundle/ChillMainBundle/Controller/ScopeApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/ScopeApiController.php @@ -12,10 +12,16 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; class ScopeApiController extends ApiController { + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + protected function customizeQuery(string $action, Request $request, $query): void { if ('_index' === $action) { diff --git a/src/Bundle/ChillMainBundle/Controller/UserApiController.php b/src/Bundle/ChillMainBundle/Controller/UserApiController.php index 262bfdfde..6177e7657 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserApiController.php @@ -15,6 +15,7 @@ use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Pagination\PaginatorInterface; use Chill\MainBundle\Security\ChillSecurity; use Doctrine\ORM\QueryBuilder; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; @@ -22,7 +23,10 @@ use Symfony\Component\Routing\Annotation\Route; class UserApiController extends ApiController { - public function __construct(private readonly ChillSecurity $security) {} + public function __construct(private readonly ChillSecurity $security, ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } #[Route(path: '/api/1.0/main/user-current-location.{_format}', name: 'chill_main_user_current_location', requirements: ['_format' => 'json'])] public function currentLocation(mixed $_format): JsonResponse diff --git a/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php b/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php index 602b84ec5..1996adee3 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php @@ -12,5 +12,12 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; -class UserGroupApiController extends ApiController {} +class UserGroupApiController extends ApiController +{ + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } +} diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php b/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php index 1b0dbbf5f..cb4480bcd 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php @@ -12,10 +12,16 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; class UserJobApiController extends ApiController { + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + protected function customizeQuery(string $action, Request $request, $query): void { if ('_index' === $action) { diff --git a/src/Bundle/ChillMainBundle/config/services/controller.yaml b/src/Bundle/ChillMainBundle/config/services/controller.yaml index 794923e65..a9d86a751 100644 --- a/src/Bundle/ChillMainBundle/config/services/controller.yaml +++ b/src/Bundle/ChillMainBundle/config/services/controller.yaml @@ -2,6 +2,7 @@ services: _defaults: autowire: true autoconfigure: true + public: false Chill\MainBundle\Controller\: resource: '../../Controller' diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php index ac7c7dec4..9951c7e16 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php @@ -29,6 +29,7 @@ use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepos use Chill\PersonBundle\Repository\AccompanyingPeriodRepository; use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter; use Chill\ThirdPartyBundle\Entity\ThirdParty; +use Doctrine\Persistence\ManagerRegistry; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\JsonResponse; @@ -46,7 +47,10 @@ use Symfony\Component\Workflow\Registry; final class AccompanyingCourseApiController extends ApiController { - public function __construct(private readonly AccompanyingPeriodRepository $accompanyingPeriodRepository, private readonly EventDispatcherInterface $eventDispatcher, private readonly ReferralsSuggestionInterface $referralAvailable, private readonly Registry $registry, private readonly ValidatorInterface $validator, private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry, private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository) {} + public function __construct(private readonly AccompanyingPeriodRepository $accompanyingPeriodRepository, private readonly EventDispatcherInterface $eventDispatcher, private readonly ReferralsSuggestionInterface $referralAvailable, private readonly Registry $registry, private readonly ValidatorInterface $validator, protected ManagerRegistry $managerRegistry, private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository) + { + parent::__construct($managerRegistry); + } public function commentApi($id, Request $request, string $_format): Response { diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php index 98467a302..3ad38f4ef 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php @@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\User; use Chill\MainBundle\Serializer\Model\Collection; use Chill\MainBundle\Serializer\Model\Counter; use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; @@ -27,7 +28,10 @@ class AccompanyingCourseWorkApiController extends ApiController public function __construct( private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository, private readonly Security $security, - ) {} + ManagerRegistry $managerRegistry, + ) { + parent::__construct($managerRegistry); + } #[Route(path: '/api/1.0/person/accompanying-period/work/my-near-end')] public function myWorksNearEndDate(Request $request): JsonResponse diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodCommentApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodCommentApiController.php index a8ede3399..80fd9758b 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodCommentApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodCommentApiController.php @@ -12,5 +12,12 @@ declare(strict_types=1); namespace Chill\PersonBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; -class AccompanyingPeriodCommentApiController extends ApiController {} +class AccompanyingPeriodCommentApiController extends ApiController +{ + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } +} diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodResourceApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodResourceApiController.php index d1a4da5d0..b488fd12f 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodResourceApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodResourceApiController.php @@ -12,5 +12,12 @@ declare(strict_types=1); namespace Chill\PersonBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; -class AccompanyingPeriodResourceApiController extends ApiController {} +class AccompanyingPeriodResourceApiController extends ApiController +{ + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } +} diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php index 05e73ad2a..2d9fa3f8a 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php @@ -22,6 +22,7 @@ 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; @@ -31,7 +32,10 @@ use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; class HouseholdApiController extends ApiController { - public function __construct(private readonly EventDispatcherInterface $eventDispatcher, private readonly HouseholdRepository $householdRepository, private readonly HouseholdACLAwareRepositoryInterface $householdACLAwareRepository, private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {} + public function __construct(private readonly EventDispatcherInterface $eventDispatcher, private readonly HouseholdRepository $householdRepository, private readonly HouseholdACLAwareRepositoryInterface $householdACLAwareRepository, protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } /** * @return \Symfony\Component\HttpFoundation\JsonResponse diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php index 0d792d6ac..ed38b5d3a 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php @@ -13,10 +13,16 @@ namespace Chill\PersonBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; use Doctrine\ORM\QueryBuilder; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; class HouseholdCompositionTypeApiController extends ApiController { + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + /** * @param QueryBuilder $query */ diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php index fd35ef31b..a92616a1d 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php @@ -23,6 +23,7 @@ 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; @@ -47,9 +48,10 @@ class HouseholdMemberController extends ApiController private readonly HouseholdRepository $householdRepository, private readonly Security $security, private readonly PositionRepository $positionRepository, - private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry, protected ParameterBagInterface $parameterBag, + ManagerRegistry $managerRegistry, ) { + parent::__construct($managerRegistry); $this->household_fields_visibility = $parameterBag->get('chill_person.household_fields'); } diff --git a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php index 88ebd05e9..0904a66cd 100644 --- a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php @@ -12,10 +12,16 @@ declare(strict_types=1); namespace Chill\PersonBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; class OpeningApiController extends ApiController { + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + protected function customizeQuery(string $action, Request $request, $qb): void { $qb->where($qb->expr()->gt('e.noActiveAfter', ':now')) diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php index ffe3295d9..4d407a294 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php @@ -18,6 +18,7 @@ use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Security\Authorization\PersonVoter; use Chill\PersonBundle\Security\AuthorizedCenterOnPersonCreationInterface; +use Doctrine\Persistence\ManagerRegistry; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\HttpFoundation\Request; @@ -32,7 +33,9 @@ class PersonApiController extends ApiController private readonly AuthorizedCenterOnPersonCreationInterface $authorizedCenterOnPersonCreation, private readonly ConfigPersonAltNamesHelper $configPersonAltNameHelper, ParameterBagInterface $parameterBag, + ManagerRegistry $managerRegistry, ) { + parent::__construct($managerRegistry); $this->showCenters = $parameterBag->get('chill_main')['acl']['form_show_centers']; } diff --git a/src/Bundle/ChillPersonBundle/Controller/RelationApiController.php b/src/Bundle/ChillPersonBundle/Controller/RelationApiController.php index 31eabb54a..383bbaa29 100644 --- a/src/Bundle/ChillPersonBundle/Controller/RelationApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/RelationApiController.php @@ -12,5 +12,12 @@ declare(strict_types=1); namespace Chill\PersonBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; -class RelationApiController extends ApiController {} +class RelationApiController extends ApiController +{ + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } +} diff --git a/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php index 4e9e5a228..325a2a00e 100644 --- a/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php @@ -15,12 +15,16 @@ use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Repository\Relationships\RelationshipRepository; use Chill\PersonBundle\Security\Authorization\PersonVoter; +use Doctrine\Persistence\ManagerRegistry; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\HttpFoundation\Response; class RelationshipApiController extends ApiController { - public function __construct(private readonly RelationshipRepository $repository) {} + public function __construct(private readonly RelationshipRepository $repository, ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } /** * @ParamConverter("person", options={"id": "person_id"}) diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php index a866ceff7..a3f3b3746 100644 --- a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php @@ -13,10 +13,16 @@ namespace Chill\PersonBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Pagination\PaginatorInterface; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; class SocialIssueApiController extends ApiController { + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } + protected function customizeQuery(string $action, Request $request, $query): void { $query->where( diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php index 2a7f39712..452b29ed3 100644 --- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php @@ -16,12 +16,16 @@ use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Serializer\Model\Collection; use Chill\PersonBundle\Entity\SocialWork\SocialAction; use Chill\PersonBundle\Repository\SocialWork\GoalRepository; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; class SocialWorkGoalApiController extends ApiController { - public function __construct(private readonly GoalRepository $goalRepository, private readonly PaginatorFactory $paginator) {} + public function __construct(private readonly GoalRepository $goalRepository, private readonly PaginatorFactory $paginator, ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } public function listBySocialAction(Request $request, SocialAction $action): Response { diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php index 9b97d8129..ad2f5e1ee 100644 --- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php @@ -16,12 +16,16 @@ use Chill\MainBundle\Serializer\Model\Collection; use Chill\PersonBundle\Entity\SocialWork\Goal; use Chill\PersonBundle\Entity\SocialWork\SocialAction; use Chill\PersonBundle\Repository\SocialWork\ResultRepository; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; class SocialWorkResultApiController extends ApiController { - public function __construct(private readonly ResultRepository $resultRepository) {} + public function __construct(private readonly ResultRepository $resultRepository, ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } public function listByGoal(Request $request, Goal $goal): Response { diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php index 6b341e926..8d123be4e 100644 --- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php @@ -16,6 +16,7 @@ use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Serializer\Model\Collection; use Chill\PersonBundle\Entity\SocialWork\SocialAction; use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository; +use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\Clock\ClockInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; @@ -26,7 +27,10 @@ final class SocialWorkSocialActionApiController extends ApiController private readonly SocialIssueRepository $socialIssueRepository, private readonly PaginatorFactory $paginator, private readonly ClockInterface $clock, - ) {} + ManagerRegistry $managerRegistry, + ) { + parent::__construct($managerRegistry); + } public function listBySocialIssueApi($id, Request $request) { diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyApiController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyApiController.php index d108a6214..a13b1d73c 100644 --- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyApiController.php +++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyApiController.php @@ -12,5 +12,12 @@ declare(strict_types=1); namespace Chill\ThirdPartyBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Doctrine\Persistence\ManagerRegistry; -class ThirdPartyApiController extends ApiController {} +class ThirdPartyApiController extends ApiController +{ + public function __construct(protected ManagerRegistry $managerRegistry) + { + parent::__construct($managerRegistry); + } +}