diff --git a/.changes/unreleased/Fixed-20241128-134834.yaml b/.changes/unreleased/Fixed-20241128-134834.yaml new file mode 100644 index 000000000..f06f2c1fb --- /dev/null +++ b/.changes/unreleased/Fixed-20241128-134834.yaml @@ -0,0 +1,5 @@ +kind: Fixed +body: Fix the serialization of gender for the generation of documents +time: 2024-11-28T13:48:34.528958771+01:00 +custom: + Issue: "329" diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php index a547ab21e..80c1e4254 100644 --- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php @@ -12,8 +12,12 @@ declare(strict_types=1); namespace Chill\ActivityBundle\DataFixtures\ORM; use Chill\ActivityBundle\Entity\Activity; +use Chill\ActivityBundle\Entity\ActivityReason; +use Chill\ActivityBundle\Entity\ActivityType; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; use Chill\MainBundle\DataFixtures\ORM\LoadUsers; +use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Entity\Person; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; @@ -32,12 +36,12 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface $this->faker = FakerFactory::create('fr_FR'); } - public function getOrder() + public function getOrder(): int { return 16400; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $persons = $this->em ->getRepository(Person::class) @@ -84,49 +88,41 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface /** * Return a random activityReason. - * - * @return \Chill\ActivityBundle\Entity\ActivityReason */ - private function getRandomActivityReason() + private function getRandomActivityReason(): ActivityReason { $reasonRef = LoadActivityReason::$references[array_rand(LoadActivityReason::$references)]; - return $this->getReference($reasonRef); + return $this->getReference($reasonRef, ActivityReason::class); } /** * Return a random activityType. - * - * @return \Chill\ActivityBundle\Entity\ActivityType */ - private function getRandomActivityType() + private function getRandomActivityType(): ActivityType { $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)]; - return $this->getReference($typeRef); + return $this->getReference($typeRef, ActivityType::class); } /** * Return a random scope. - * - * @return \Chill\MainBundle\Entity\Scope */ - private function getRandomScope() + private function getRandomScope(): Scope { $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)]; - return $this->getReference($scopeRef); + return $this->getReference($scopeRef, Scope::class); } /** * Return a random user. - * - * @return \Chill\MainBundle\Entity\User */ - private function getRandomUser() + private function getRandomUser(): User { $userRef = array_rand(LoadUsers::$refs); - return $this->getReference($userRef); + return $this->getReference($userRef, User::class); } } diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php index ee999d7f1..2718ce9e1 100644 --- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php @@ -38,7 +38,7 @@ class LoadActivityNotifications extends AbstractFixture implements DependentFixt ], ]; - public function getDependencies() + public function getDependencies(): array { return [ LoadActivity::class, diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php index af674be9e..f39b922ba 100644 --- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\ActivityBundle\DataFixtures\ORM; use Chill\ActivityBundle\Entity\ActivityReason; +use Chill\ActivityBundle\Entity\ActivityReasonCategory; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -23,12 +24,12 @@ class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterf { public static $references = []; - public function getOrder() + public function getOrder(): int { return 16300; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $reasons = [ [ @@ -56,7 +57,7 @@ class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterf $activityReason = (new ActivityReason()) ->setName($r['name']) ->setActive(true) - ->setCategory($this->getReference($r['category'])); + ->setCategory($this->getReference($r['category'], ActivityReasonCategory::class)); $manager->persist($activityReason); $reference = 'activity_reason_'.$r['name']['en']; $this->addReference($reference, $activityReason); diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php index a78ae3972..ad469c068 100644 --- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php @@ -21,12 +21,12 @@ use Doctrine\Persistence\ObjectManager; */ class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 16200; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $categs = [ ['name' => ['fr' => 'Logement', 'en' => 'Housing', 'nl' => 'Woning']], diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php index 891f2c979..ee1dcb510 100644 --- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\ActivityBundle\DataFixtures\ORM; use Chill\ActivityBundle\Entity\ActivityType; +use Chill\ActivityBundle\Entity\ActivityTypeCategory; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -23,12 +24,12 @@ class LoadActivityType extends Fixture implements OrderedFixtureInterface { public static $references = []; - public function getOrder() + public function getOrder(): int { return 16100; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $types = [ // Exange @@ -57,7 +58,7 @@ class LoadActivityType extends Fixture implements OrderedFixtureInterface echo 'Creating activity type : '.$t['name']['fr'].' (cat:'.$t['category']." \n"; $activityType = (new ActivityType()) ->setName($t['name']) - ->setCategory($this->getReference('activity_type_cat_'.$t['category'])) + ->setCategory($this->getReference('activity_type_cat_'.$t['category'], ActivityTypeCategory::class)) ->setSocialIssuesVisible(1) ->setSocialActionsVisible(1); $manager->persist($activityType); diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php index 2f15a2676..4e246dd82 100644 --- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php @@ -23,12 +23,12 @@ class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterfac { public static $references = []; - public function getOrder() + public function getOrder(): int { return 16050; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $categories = [ [ diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php index e7c893cd9..fcff80f62 100644 --- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php @@ -15,7 +15,9 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter; use Chill\ActivityBundle\Security\Authorization\ActivityVoter; use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; +use Chill\MainBundle\Entity\PermissionsGroup; use Chill\MainBundle\Entity\RoleScope; +use Chill\MainBundle\Entity\Scope; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -26,18 +28,18 @@ use Doctrine\Persistence\ObjectManager; */ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 16000; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) { - $permissionsGroup = $this->getReference($permissionsGroupRef); + $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class); foreach (LoadScopes::$references as $scopeRef) { - $scope = $this->getReference($scopeRef); + $scope = $this->getReference($scopeRef, Scope::class); // create permission group switch ($permissionsGroup->getName()) { case 'social': diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php index 12c82be00..a60398507 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php +++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\AsideActivityBundle\DataFixtures\ORM; use Chill\AsideActivityBundle\Entity\AsideActivity; +use Chill\AsideActivityBundle\Entity\AsideActivityCategory; use Chill\MainBundle\DataFixtures\ORM\LoadUsers; use Chill\MainBundle\Repository\UserRepository; use Doctrine\Bundle\FixturesBundle\Fixture; @@ -30,7 +31,7 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface ]; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $user = $this->userRepository->findOneBy(['username' => 'center a_social']); @@ -43,7 +44,7 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface ->setUpdatedAt(new \DateTimeImmutable('now')) ->setUpdatedBy($user) ->setType( - $this->getReference('aside_activity_category_0') + $this->getReference('aside_activity_category_0', AsideActivityCategory::class) ) ->setDate((new \DateTimeImmutable('today')) ->sub(new \DateInterval('P'.\random_int(1, 100).'D'))); diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php index 3e6b4247a..73f764ca5 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php +++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php @@ -16,7 +16,7 @@ use Doctrine\Persistence\ObjectManager; class LoadAsideActivityCategory extends \Doctrine\Bundle\FixturesBundle\Fixture { - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach ( [ diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php index 2ef7365ca..471f9a81a 100644 --- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php +++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php @@ -37,7 +37,7 @@ class LoadCalendarACL extends Fixture implements OrderedFixtureInterface foreach (LoadPermissionsGroup::$refs as $permissionGroupRef) { /** @var PermissionsGroup $group */ - $group = $this->getReference($permissionGroupRef); + $group = $this->getReference($permissionGroupRef, PermissionsGroup::class); foreach ($roleScopes as $scope) { $group->addRoleScope($scope); diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php index f677a4283..f2cd6e032 100644 --- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php +++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php @@ -63,6 +63,6 @@ class LoadInvite extends Fixture implements FixtureGroupInterface { $userRef = array_rand(LoadUsers::$refs); - return $this->getReference($userRef); + return $this->getReference($userRef, User::class); } } diff --git a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php index f95991b7c..4da28baac 100644 --- a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php +++ b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php @@ -46,12 +46,12 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface $this->fakerNl = \Faker\Factory::create('nl_NL'); } - public function getOrder() + public function getOrder(): int { return 1000; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { echo "Loading Options \n"; diff --git a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php index f38102a10..a136dec58 100644 --- a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php +++ b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php @@ -23,7 +23,7 @@ use Doctrine\Persistence\ObjectManager; */ class LoadDocGeneratorTemplate extends AbstractFixture { - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $templates = [ [ diff --git a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php index 1217c2a12..df52b848b 100644 --- a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php +++ b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php @@ -14,7 +14,9 @@ namespace Chill\DocStoreBundle\DataFixtures\ORM; use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter; use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; +use Chill\MainBundle\Entity\PermissionsGroup; use Chill\MainBundle\Entity\RoleScope; +use Chill\MainBundle\Entity\Scope; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -24,19 +26,19 @@ use Doctrine\Persistence\ObjectManager; */ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 35000; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) { - $permissionsGroup = $this->getReference($permissionsGroupRef); + $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class); printf("processing permission group %s \n", $permissionsGroup->getName()); foreach (LoadScopes::$references as $scopeRef) { - $scope = $this->getReference($scopeRef); + $scope = $this->getReference($scopeRef, Scope::class); printf("processing scope %s \n", $scope->getName()['en']); // create permission group switch ($permissionsGroup->getName()) { diff --git a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php index 92c3780fe..2a9b43791 100644 --- a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php +++ b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php @@ -18,12 +18,12 @@ use Doctrine\Persistence\ObjectManager; class LoadDocumentCategory extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 35010; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $category = (new DocumentCategory('chill-doc-store', 10)) ->setDocumentClass(\Chill\DocStoreBundle\Entity\PersonDocument::class) diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php index 1d2668c12..73cb21ca2 100644 --- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php +++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php @@ -25,12 +25,12 @@ class LoadEventTypes extends AbstractFixture implements OrderedFixtureInterface { public static $refs = []; - public function getOrder() + public function getOrder(): int { return 30000; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { /* * Echange de savoirs diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php index db431c858..94167f6b8 100644 --- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php +++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php @@ -12,9 +12,11 @@ declare(strict_types=1); namespace Chill\EventBundle\DataFixtures\ORM; use Chill\EventBundle\Entity\Event; +use Chill\EventBundle\Entity\EventType; use Chill\EventBundle\Entity\Participation; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; use Chill\MainBundle\Entity\Center; +use Chill\MainBundle\Entity\Scope; use Chill\PersonBundle\Entity\Person; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; @@ -44,11 +46,12 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa $event = (new Event()) ->setDate($this->faker->dateTimeBetween('-2 years', '+6 months')) ->setName($this->faker->words(random_int(2, 4), true)) - ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)])) + ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)], EventType::class)) ->setCenter($center) ->setCircle( $this->getReference( - LoadScopes::$references[array_rand(LoadScopes::$references)] + LoadScopes::$references[array_rand(LoadScopes::$references)], + Scope::class ) ); $manager->persist($event); @@ -58,12 +61,12 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa return $events; } - public function getOrder() + public function getOrder(): int { return 30010; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $centers = $manager->getRepository(Center::class) ->findAll(); diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php index 87e676730..1619b3b38 100644 --- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php +++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php @@ -13,7 +13,9 @@ namespace Chill\EventBundle\DataFixtures\ORM; use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; +use Chill\MainBundle\Entity\PermissionsGroup; use Chill\MainBundle\Entity\RoleScope; +use Chill\MainBundle\Entity\Scope; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -23,18 +25,18 @@ use Doctrine\Persistence\ObjectManager; */ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 30011; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) { - $permissionsGroup = $this->getReference($permissionsGroupRef); + $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class); foreach (LoadScopes::$references as $scopeRef) { - $scope = $this->getReference($scopeRef); + $scope = $this->getReference($scopeRef, Scope::class); // create permission group switch ($permissionsGroup->getName()) { case 'social': diff --git a/src/Bundle/ChillEventBundle/Search/EventSearch.php b/src/Bundle/ChillEventBundle/Search/EventSearch.php index ad0e83bd3..7c347bef6 100644 --- a/src/Bundle/ChillEventBundle/Search/EventSearch.php +++ b/src/Bundle/ChillEventBundle/Search/EventSearch.php @@ -45,7 +45,7 @@ class EventSearch extends AbstractSearch private readonly PaginatorFactory $paginatorFactory, ) {} - public function getOrder() + public function getOrder(): int { return 3000; } diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php index fdecd4092..6df6a7a51 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php @@ -19,25 +19,25 @@ use Doctrine\Persistence\ObjectManager; */ trait LoadAbstractNotificationsTrait { - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { return; foreach ($this->notifs as $notif) { - $entityId = $this->getReference($notif['entityRef'])->getId(); + $entityId = $this->getReference($notif['entityRef'], Notification::class)->getId(); echo 'Adding notification for '.$notif['entityClass'].'(entity id:'.$entityId.")\n"; $newNotif = (new Notification()) ->setMessage($notif['message']) - ->setSender($this->getReference($notif['sender'])) + ->setSender($this->getReference($notif['sender'], Notification::class)) ->setRelatedEntityClass($notif['entityClass']) ->setRelatedEntityId($entityId) ->setDate(new \DateTimeImmutable('now')) ->setRead([]); foreach ($notif['addressees'] as $addressee) { - $newNotif->addAddressee($this->getReference($addressee)); + $newNotif->addAddressee($this->getReference($addressee, Notification::class)); } $manager->persist($newNotif); diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php index d04ef29e8..1c71e17cb 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php @@ -13,6 +13,7 @@ namespace Chill\MainBundle\DataFixtures\ORM; use Chill\MainBundle\Doctrine\Model\Point; use Chill\MainBundle\Entity\AddressReference; +use Chill\MainBundle\Entity\PostalCode; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -33,12 +34,12 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt $this->faker = \Faker\Factory::create('fr_FR'); } - public function getOrder() + public function getOrder(): int { return 51; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { echo "loading some reference address... \n"; @@ -69,7 +70,8 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt $ar->setStreetNumber((string) random_int(0, 199)); $ar->setPoint($this->getRandomPoint()); $ar->setPostcode($this->getReference( - LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)] + LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)], + PostalCode::class )); $ar->setMunicipalityCode($ar->getPostcode()->getCode()); diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php index d835aad38..1c78db698 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php @@ -31,12 +31,12 @@ class LoadCenters extends AbstractFixture implements OrderedFixtureInterface public static $refs = []; - public function getOrder() + public function getOrder(): int { return 100; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (static::$centers as $new) { $center = new Center(); diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php index 3433eebd7..1f68abd21 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php @@ -25,12 +25,12 @@ class LoadCountries extends AbstractFixture implements ContainerAwareInterface, { private ?ContainerInterface $container = null; - public function getOrder() + public function getOrder(): int { return 20; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { echo "loading countries... \n"; diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGenders.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGenders.php index 2d74e6977..39a7be8b6 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGenders.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGenders.php @@ -38,12 +38,12 @@ class LoadGenders extends AbstractFixture implements OrderedFixtureInterface ], ]; - public function getOrder() + public function getOrder(): int { return 100; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { echo "loading genders... \n"; diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php index 8254dec1d..8c9d37ec0 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php @@ -11,7 +11,9 @@ declare(strict_types=1); namespace Chill\MainBundle\DataFixtures\ORM; +use Chill\MainBundle\Entity\Center; use Chill\MainBundle\Entity\GroupCenter; +use Chill\MainBundle\Entity\PermissionsGroup; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -20,18 +22,18 @@ class LoadGroupCenters extends AbstractFixture implements OrderedFixtureInterfac { public static $refs = []; - public function getOrder() + public function getOrder(): int { return 500; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (LoadCenters::$refs as $centerRef) { foreach (LoadPermissionsGroup::$refs as $permissionGroupRef) { $GroupCenter = new GroupCenter(); - $GroupCenter->setCenter($this->getReference($centerRef)); - $GroupCenter->setPermissionsGroup($this->getReference($permissionGroupRef)); + $GroupCenter->setCenter($this->getReference($centerRef, Center::class)); + $GroupCenter->setPermissionsGroup($this->getReference($permissionGroupRef, PermissionsGroup::class)); $manager->persist($GroupCenter); diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php index c5c03277f..a5b49e347 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php @@ -33,12 +33,12 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface, // This array contains regional code to not exclude private array $regionalVersionToInclude = ['ro_MD']; - public function getOrder() + public function getOrder(): int { return 10; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { echo "loading languages... \n"; diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php index aab896add..a1185c655 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php @@ -25,7 +25,7 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac { private ?ContainerInterface $container = null; - public function getOrder() + public function getOrder(): int { return 52; } diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php index 885fc9af6..3bc39a438 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\DataFixtures\ORM; use Chill\MainBundle\Entity\PermissionsGroup; +use Chill\MainBundle\Entity\RoleScope; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -47,19 +48,19 @@ class LoadPermissionsGroup extends AbstractFixture implements OrderedFixtureInte public static $refs = []; - public function getOrder() + public function getOrder(): int { return 400; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (static::$permissionGroup as $new) { $permissionGroup = new PermissionsGroup(); $permissionGroup->setName($new['name']); foreach ($new['role_scopes'] as $roleScopeRef) { - $permissionGroup->addRoleScope($this->getReference($roleScopeRef)); + $permissionGroup->addRoleScope($this->getReference($roleScopeRef, RoleScope::class)); } $manager->persist($permissionGroup); diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php index 29ee21ca6..b1cebbaab 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php @@ -325,12 +325,12 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface 85800,GIVRAND,FR,85100,46.6822701061,-1.8787272243,INSEE EOF; - public function getOrder() + public function getOrder(): int { return 50; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { echo "loading postal codes... \n"; $this->loadPostalCodeCSV($manager, self::$postalCodeBelgium, 'BE'); @@ -365,7 +365,7 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface $manager->persist($c); $ref = 'postal_code_'.$code[0]; - if (!$this->hasReference($ref)) { + if (!$this->hasReference($ref, PostalCode::class)) { $this->addReference($ref, $c); self::$refs[] = $ref; } diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php index 85e3f4ec2..a74ec9c64 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\DataFixtures\ORM; use Chill\MainBundle\Entity\RoleScope; +use Chill\MainBundle\Entity\Scope; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -44,19 +45,19 @@ class LoadRoleScopes extends AbstractFixture implements OrderedFixtureInterface public static $references = []; - public function getOrder() + public function getOrder(): int { return 300; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (static::$permissions as $key => $permission) { foreach (LoadScopes::$references as $scopeReference) { $roleScope = new RoleScope(); $roleScope->setRole($key) - ->setScope($this->getReference($scopeReference)); - $reference = 'role_scope_'.$key.'_'.$this->getReference($scopeReference)->getName()['en']; + ->setScope($this->getReference($scopeReference, Scope::class)); + $reference = 'role_scope_'.$key.'_'.$this->getReference($scopeReference, Scope::class)->getName()['en']; echo "Creating {$reference} \n"; $this->addReference($reference, $roleScope); $manager->persist($roleScope); diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php index 10c10de8c..5d1c77e65 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php @@ -46,12 +46,12 @@ class LoadScopes extends AbstractFixture implements OrderedFixtureInterface ], ]; - public function getOrder() + public function getOrder(): int { return 200; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach ($this->scopes as $new) { $scope = new \Chill\MainBundle\Entity\Scope(); diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php index 614a83515..430efaf56 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php @@ -24,7 +24,7 @@ class LoadUserGroup extends Fixture implements FixtureGroupInterface return ['user-group']; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $centerASocial = $manager->getRepository(User::class)->findOneBy(['username' => 'center a_social']); $centerBSocial = $manager->getRepository(User::class)->findOneBy(['username' => 'center b_social']); diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php index 1c99a3a74..3afdefbab 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\MainBundle\DataFixtures\ORM; +use Chill\MainBundle\Entity\GroupCenter; use Chill\MainBundle\Entity\User; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; @@ -54,12 +55,12 @@ class LoadUsers extends AbstractFixture implements ContainerAwareInterface, Orde private ?ContainerInterface $container = null; - public function getOrder() + public function getOrder(): int { return 1000; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (self::$refs as $username => $params) { $user = new User(); @@ -80,7 +81,7 @@ class LoadUsers extends AbstractFixture implements ContainerAwareInterface, Orde ->setEmail(sprintf('%s@chill.social', \str_replace(' ', '', (string) $username))); foreach ($params['groupCenterRefs'] as $groupCenterRef) { - $user->addGroupCenter($this->getReference($groupCenterRef)); + $user->addGroupCenter($this->getReference($groupCenterRef, GroupCenter::class)); } echo 'Creating user '.$username."... \n"; diff --git a/src/Bundle/ChillMainBundle/Entity/Gender.php b/src/Bundle/ChillMainBundle/Entity/Gender.php index 59c0bd134..d1baad400 100644 --- a/src/Bundle/ChillMainBundle/Entity/Gender.php +++ b/src/Bundle/ChillMainBundle/Entity/Gender.php @@ -21,13 +21,13 @@ use Symfony\Component\Validator\Constraints as Assert; #[ORM\Table(name: 'chill_main_gender')] class Gender { - #[Serializer\Groups(['read'])] + #[Serializer\Groups(['read', 'docgen:read'])] #[ORM\Id] #[ORM\GeneratedValue] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER)] private ?int $id = null; - #[Serializer\Groups(['read'])] + #[Serializer\Groups(['read', 'docgen:read'])] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)] private array $label = []; @@ -36,7 +36,7 @@ class Gender private bool $active = true; #[Assert\NotNull(message: 'You must choose a gender translation')] - #[Serializer\Groups(['read'])] + #[Serializer\Groups(['read', 'docgen:read'])] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, enumType: GenderEnum::class)] private GenderEnum $genderTranslation; diff --git a/src/Bundle/ChillMainBundle/Search/SearchInterface.php b/src/Bundle/ChillMainBundle/Search/SearchInterface.php index 10d4f2a06..11bccaaa0 100644 --- a/src/Bundle/ChillMainBundle/Search/SearchInterface.php +++ b/src/Bundle/ChillMainBundle/Search/SearchInterface.php @@ -34,10 +34,8 @@ interface SearchInterface * the order in which the results will appears in the global view. * * (this may be eventually defined in config.yml) - * - * @return int */ - public function getOrder(); + public function getOrder(): int; /** * we may desactive the search interface by default. in this case, diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/GenderDocGenNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/GenderDocGenNormalizer.php new file mode 100644 index 000000000..f7dd84dfc --- /dev/null +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/GenderDocGenNormalizer.php @@ -0,0 +1,39 @@ + $gender->getId(), + 'label' => $this->translatableStringHelper->localize($gender->getLabel()), + 'genderTranslation' => $gender->getGenderTranslation(), + ]; + } +} diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/GenderDocGenNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/GenderDocGenNormalizerTest.php new file mode 100644 index 000000000..7f0762ad8 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/GenderDocGenNormalizerTest.php @@ -0,0 +1,68 @@ +translatableStringHelper = $this->createMock(TranslatableStringHelperInterface::class); + $this->normalizer = new GenderDocGenNormalizer($this->translatableStringHelper); + } + + public function testSupportsNormalizationReturnsTrueForGenderInstance(): void + { + $gender = $this->createMock(Gender::class); + $this->assertTrue($this->normalizer->supportsNormalization($gender)); + } + + public function testSupportsNormalizationReturnsFalseForNonGenderInstance(): void + { + $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass())); + } + + public function testNormalizeReturnsCorrectData(): void + { + $gender = $this->createMock(Gender::class); + + $gender->method('getId')->willReturn(1); + $gender->method('getLabel')->willReturn(['fr' => 'homme', 'en' => 'man']); + $gender->method('getGenderTranslation')->willReturn(GenderEnum::MALE); + + $this->translatableStringHelper + ->method('localize') + ->with(['fr' => 'homme', 'en' => 'man']) + ->willReturn('homme'); + + $expected = [ + 'id' => 1, + 'label' => 'homme', + 'genderTranslation' => GenderEnum::MALE, + ]; + + $this->assertEquals($expected, $this->normalizer->normalize($gender)); + } +} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php index fb836ed3a..e6c6cc5c4 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php @@ -48,12 +48,12 @@ class LoadAccompanyingPeriodClosingMotive extends AbstractFixture implements Ord public static $references = []; - public function getOrder() + public function getOrder(): int { return 9500; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (static::$closingMotives as $ref => $new) { $motive = new ClosingMotive(); diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php index e298c2cc3..ee5a6f6f9 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php @@ -38,7 +38,7 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep ], ]; - public function getDependencies() + public function getDependencies(): array { return [ LoadPeople::class, diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php index 8eb0688bd..1d6cdc206 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php @@ -27,12 +27,12 @@ class LoadAccompanyingPeriodOrigin extends AbstractFixture implements OrderedFix private array $phoneCall = ['en' => 'phone call', 'fr' => 'appel téléphonique']; - public function getOrder() + public function getOrder(): int { return 9000; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $o = new Origin(); $o->setLabel($this->phoneCall); diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php index 44992ebef..60df2fd5f 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\DataFixtures\ORM; +use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\SocialWork\Evaluation; use Chill\PersonBundle\Entity\SocialWork\SocialAction; @@ -28,14 +29,14 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture public function __construct(private readonly AccompanyingPeriodRepository $periodRepository, private readonly EvaluationRepository $evaluationRepository) {} - public function getDependencies() + public function getDependencies(): array { return [ LoadPeople::class, ]; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { // load all the period which are confirmed $periods = $this->periodRepository @@ -64,9 +65,9 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture ->setStartDate(new \DateTimeImmutable('today')) ->addPerson($period->getPersons()->first()) ->setCreatedAt(new \DateTimeImmutable()) - ->setCreatedBy($this->getReference('center a_social')) + ->setCreatedBy($this->getReference('center a_social', User::class)) ->setUpdatedAt(new \DateTimeImmutable()) - ->setUpdatedBy($this->getReference('center a_social')); + ->setUpdatedBy($this->getReference('center a_social', User::class)); $manager->persist($work); if ($action->getEvaluations()->count() > 0) { @@ -91,9 +92,9 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture ->setStartDate(new \DateTimeImmutable('today')) ->addPerson($period->getPersons()->first()) ->setCreatedAt(new \DateTimeImmutable()) - ->setCreatedBy($this->getReference('center a_social')) + ->setCreatedBy($this->getReference('center a_social', User::class)) ->setUpdatedAt(new \DateTimeImmutable()) - ->setUpdatedBy($this->getReference('center a_social')); + ->setUpdatedBy($this->getReference('center a_social', User::class)); $manager->persist($work); $ev = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation(); $ev->setAccompanyingPeriodWork($work) diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php index 2acbcbfbd..5bff01f20 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php @@ -40,12 +40,12 @@ class LoadCustomFields extends AbstractFixture implements OrderedFixtureInterfac ) {} // put your code here - public function getOrder() + public function getOrder(): int { return 10003; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $this->loadFields($manager); $this->loadData($manager); diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php index ba2c67a08..fdefa5dc8 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php @@ -16,6 +16,7 @@ use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes; use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Entity\PostalCode; use Chill\PersonBundle\Entity\Household\Household; +use Chill\PersonBundle\Entity\Household\Position; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Person\PersonCenterHistory; use Chill\PersonBundle\Household\MembersEditorFactory; @@ -38,7 +39,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface $this->loader = new NativeLoader(); } - public function getDependencies() + public function getDependencies(): array { return [ LoadPeople::class, @@ -46,7 +47,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface ]; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { // generate two times the participation. This will lead to // some movement in participation (same people in two differents @@ -127,7 +128,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface foreach ($this->getRandomPersons(1, 3) as $person) { $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W')); - $position = $this->getReference(LoadHouseholdPosition::ADULT); + $position = $this->getReference(LoadHouseholdPosition::ADULT, Position::class); $movement->addMovement($date, $person, $position, 0 === $k, 'self generated'); ++$k; @@ -136,7 +137,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface // load children foreach ($this->getRandomPersons(0, 3) as $person) { $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W')); - $position = $this->getReference(LoadHouseholdPosition::CHILD); + $position = $this->getReference(LoadHouseholdPosition::CHILD, Position::class); $movement->addMovement($date, $person, $position, 0 === $k, 'self generated'); ++$k; @@ -145,7 +146,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface // load children out foreach ($this->getRandomPersons(0, 2) as $person) { $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W')); - $position = $this->getReference(LoadHouseholdPosition::CHILD_OUT); + $position = $this->getReference(LoadHouseholdPosition::CHILD_OUT, Position::class); $movement->addMovement($date, $person, $position, 0 === $k, 'self generated'); ++$k; @@ -161,7 +162,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface { $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)]; - return $this->getReference($ref); + return $this->getReference($ref, PostalCode::class); } private function getRandomPersons(int $min, int $max): array diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php index c985f26d3..9b81b9cb8 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php @@ -34,7 +34,7 @@ class LoadHouseholdCompositionType extends AbstractFixture implements FixtureGro return ['composition-type']; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (self::TYPES as $type) { $manager->persist( diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php index f5c28c8c2..fa3e36900 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php @@ -29,7 +29,7 @@ class LoadHouseholdPosition extends Fixture ['Enfant hors ménage', false, false, 3.0, self::CHILD_OUT], ]; - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach ( self::POSITIONS_DATA as [$name, $share, $allowHolder, diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php index ddce77d6c..69f3c4cf4 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php @@ -31,12 +31,12 @@ class LoadMaritalStatus extends AbstractFixture implements OrderedFixtureInterfa ['id' => 'unknown', 'name' => ['en' => 'unknown', 'fr' => 'indéterminé']], ]; - public function getOrder() + public function getOrder(): int { return 9999; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { echo "loading maritalStatuses... \n"; diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php index f1be52959..d5299af14 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php @@ -241,7 +241,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord $this->loader = new NativeLoader($this->faker); } - public function getOrder() + public function getOrder(): int { return 10000; } @@ -310,7 +310,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord return $this->cacheMaritalStatuses[array_rand($this->cacheMaritalStatuses)]; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $this->loadExpectedPeople($manager); $this->loadRandPeople($manager); @@ -358,8 +358,8 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord if (\random_int(0, 10) > 3) { // always add social scope: - $accompanyingPeriod->addScope($this->getReference('scope_social')); - $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN); + $accompanyingPeriod->addScope($this->getReference('scope_social', Scope::class)); + $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN, AccompanyingPeriod\Origin::class); $accompanyingPeriod->setOrigin($origin); $accompanyingPeriod->setIntensity('regular'); $accompanyingPeriod->setAddressLocation($this->createAddress()); @@ -472,7 +472,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord { $ref = LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]; - return $this->getReference($ref); + return $this->getReference($ref, PostalCode::class); } private function getRandomSocialIssue(): SocialIssue diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php index 4b57dd048..767923bb6 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php @@ -12,7 +12,9 @@ declare(strict_types=1); namespace Chill\PersonBundle\DataFixtures\ORM; use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup; +use Chill\MainBundle\Entity\PermissionsGroup; use Chill\MainBundle\Entity\RoleScope; +use Chill\MainBundle\Entity\Scope; use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter; use Chill\PersonBundle\Security\Authorization\PersonVoter; use Doctrine\Common\DataFixtures\AbstractFixture; @@ -25,16 +27,16 @@ use Doctrine\Persistence\ObjectManager; */ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 9600; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) { - $permissionsGroup = $this->getReference($permissionsGroupRef); - $scopeSocial = $this->getReference('scope_social'); + $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class); + $scopeSocial = $this->getReference('scope_social', Scope::class); // create permission group switch ($permissionsGroup->getName()) { diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php index 529918377..b987d1ebc 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php @@ -35,7 +35,7 @@ class LoadRelations extends Fixture implements FixtureGroupInterface return ['person_relations']; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (self::RELATIONS as $key => $value) { echo 'Creating a new relation type: relation'.$value['title']['fr'].'reverse relation: '.$value['reverseTitle']['fr']."\n"; diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php index 3efcc6386..dcbb3a4c3 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php @@ -14,6 +14,7 @@ namespace Chill\PersonBundle\DataFixtures\ORM; use Chill\MainBundle\DataFixtures\ORM\LoadUsers; use Chill\MainBundle\Entity\User; use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper; +use Chill\PersonBundle\Entity\Relationships\Relation; use Chill\PersonBundle\Entity\Relationships\Relationship; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; @@ -46,7 +47,7 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface ->setFromPerson($this->getRandomPerson($this->em)) ->setToPerson($this->getRandomPerson($this->em)) ->setRelation($this->getReference(LoadRelations::RELATION_KEY. - random_int(0, \count(LoadRelations::RELATIONS) - 1))) + random_int(0, \count(LoadRelations::RELATIONS) - 1), Relation::class)) ->setReverse((bool) random_int(0, 1)) ->setCreatedBy($user) ->setUpdatedBy($user) @@ -74,6 +75,6 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface { $userRef = array_rand(LoadUsers::$refs); - return $this->getReference($userRef); + return $this->getReference($userRef, User::class); } } diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php index dc1e7b4dd..2c7e22b46 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php @@ -21,12 +21,12 @@ class LoadSocialWorkMetadata extends Fixture implements OrderedFixtureInterface { public function __construct(private readonly SocialWorkMetadata $importer) {} - public function getOrder() + public function getOrder(): int { return 9500; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { try { $csv = Reader::createFromPath(__DIR__.'/data/social_work_metadata.csv'); diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php index 8462d5a32..c5c15e125 100644 --- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php +++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php @@ -169,7 +169,7 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf * * @see \Chill\MainBundle\Search\SearchInterface::getOrder() */ - public function getOrder() + public function getOrder(): int { return 100; } diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/GenderDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/GenderDocGenNormalizer.php new file mode 100644 index 000000000..5af99be5a --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/GenderDocGenNormalizer.php @@ -0,0 +1,39 @@ + $gender->getId(), + 'label' => $this->translatableStringHelper->localize($gender->getLabel()), + 'genderTranslation' => $gender->getGenderTranslation(), + ]; + } +} diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php index 582127704..29c22280c 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php @@ -95,7 +95,8 @@ class PersonDocGenNormalizer implements 'age' => (int) $person->getAge(), 'birthdate' => $this->normalizer->normalize($person->getBirthdate(), $format, $dateContext), 'deathdate' => $this->normalizer->normalize($person->getDeathdate(), $format, $dateContext), - 'gender' => $this->normalizer->normalize($person->getGender(), $format, $genderContext), + 'gender' => null !== ($g = $person->getGender()) ? $this->translatableStringHelper->localize($g->getLabel()) : '', + 'genderEntity' => $this->normalizer->normalize($person->getGender(), $format, $genderContext), 'maritalStatus' => null !== ($ms = $person->getMaritalStatus()) ? $this->translatableStringHelper->localize($ms->getName()) : '', 'maritalStatusDate' => $this->normalizer->normalize($person->getMaritalStatusDate(), $format, $dateContext), 'maritalStatusComment' => $this->normalizer->normalize($person->getMaritalStatusComment(), $format, $dateContext), @@ -215,6 +216,7 @@ class PersonDocGenNormalizer implements 'civility' => Civility::class, 'birthdate' => \DateTimeInterface::class, 'deathdate' => \DateTimeInterface::class, + 'genderEntity' => Gender::class, 'gender', 'maritalStatus', 'maritalStatusDate' => \DateTimeInterface::class, 'maritalStatusComment', diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php index 797ca2595..fb2e54fe9 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php @@ -40,7 +40,6 @@ final class PersonDocGenNormalizerTest extends KernelTestCase private const BLANK = [ 'id' => '', - 'center' => '', 'firstName' => '', 'lastName' => '', 'altNames' => '', @@ -50,6 +49,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase 'birthdate' => ['short' => '', 'long' => ''], 'deathdate' => ['short' => '', 'long' => ''], 'gender' => '', + 'genderEntity' => '', 'civility' => '@ignored', 'address' => '@ignored', 'maritalStatus' => '', diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php index e32b73544..707133890 100644 --- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php +++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\ReportBundle\DataFixtures\ORM; use Chill\CustomFieldsBundle\Entity\CustomField; +use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -21,12 +22,12 @@ use Doctrine\Persistence\ObjectManager; */ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 15001; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $cFTypes = [ ['type' => 'text', 'options' => ['maxLength' => '255']], @@ -74,7 +75,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface ->setOptions($cFType['options']) ->setName(['fr' => "CustomField {$i}"]) ->setOrdering(random_int(0, 1000) / 1000) - ->setCustomFieldsGroup($this->getReference('cf_group_report_'.random_int(0, 3))); + ->setCustomFieldsGroup($this->getReference('cf_group_report_'.random_int(0, 3), CustomFieldsGroup::class)); $manager->persist($customField); } @@ -87,7 +88,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface private function createExpectedFields(ObjectManager $manager) { // report logement - $reportLogement = $this->getReference('cf_group_report_logement'); + $reportLogement = $this->getReference('cf_group_report_logement', CustomFieldsGroup::class); $houseTitle = (new CustomField()) ->setSlug('house_title') @@ -143,7 +144,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface $manager->persist($descriptionLogement); // report problems - $reportEducation = $this->getReference('cf_group_report_education'); + $reportEducation = $this->getReference('cf_group_report_education', CustomFieldsGroup::class); $title = (new CustomField()) ->setSlug('title') diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php index 6e4639210..3ec546c93 100644 --- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php +++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php @@ -21,12 +21,12 @@ use Doctrine\Persistence\ObjectManager; */ class LoadCustomFieldsGroup extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 15000; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { echo "loading customFieldsGroup...\n"; diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php index 2aa175b80..cb375d30f 100644 --- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php +++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php @@ -13,7 +13,9 @@ namespace Chill\ReportBundle\DataFixtures\ORM; use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; +use Chill\MainBundle\Entity\PermissionsGroup; use Chill\MainBundle\Entity\RoleScope; +use Chill\MainBundle\Entity\Scope; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -24,19 +26,19 @@ use Doctrine\Persistence\ObjectManager; */ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 14999; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) { - $permissionsGroup = $this->getReference($permissionsGroupRef); + $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class); printf("processing permission group %s \n", $permissionsGroup->getName()); foreach (LoadScopes::$references as $scopeRef) { - $scope = $this->getReference($scopeRef); + $scope = $this->getReference($scopeRef, Scope::class); printf("processing scope %s \n", $scope->getName()['en']); // create permission group switch ($permissionsGroup->getName()) { diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php index 222458a25..3519ef4cd 100644 --- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php +++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php @@ -12,8 +12,11 @@ declare(strict_types=1); namespace Chill\ReportBundle\DataFixtures\ORM; use Chill\CustomFieldsBundle\Entity\CustomField; +use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; use Chill\MainBundle\DataFixtures\ORM\LoadUsers; +use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Entity\Person; use Chill\ReportBundle\Entity\Report; use Doctrine\Common\DataFixtures\AbstractFixture; @@ -35,12 +38,12 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa $this->faker = FakerFactory::create('fr_FR'); } - public function getOrder() + public function getOrder(): int { return 15002; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $this->createExpected($manager); @@ -60,9 +63,9 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa if (null !== $charline) { $report = (new Report()) ->setPerson($charline) - ->setCFGroup($this->getReference('cf_group_report_logement')) + ->setCFGroup($this->getReference('cf_group_report_logement', CustomFieldsGroup::class)) ->setDate(new \DateTime('2015-01-05')) - ->setScope($this->getReference('scope_social')); + ->setScope($this->getReference('scope_social', Scope::class)); $this->fillReport($report); $manager->persist($report); @@ -81,8 +84,8 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa ->setPerson($person) ->setCFGroup( random_int(0, 10) > 5 ? - $this->getReference('cf_group_report_logement') : - $this->getReference('cf_group_report_education') + $this->getReference('cf_group_report_logement', CustomFieldsGroup::class) : + $this->getReference('cf_group_report_education', CustomFieldsGroup::class) ) ->setScope($this->getScopeRandom()); $this->fillReport($report); @@ -95,7 +98,7 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa // setUser $usernameRef = array_rand(LoadUsers::$refs); $report->setUser( - $this->getReference($usernameRef) + $this->getReference($usernameRef, User::class) ); // set date if null @@ -208,13 +211,13 @@ final class LoadReports extends AbstractFixture implements OrderedFixtureInterfa } /** - * @return \Chill\MainBundle\Entity\Scope + * @return Scope */ private function getScopeRandom() { $ref = LoadScopes::$references[array_rand(LoadScopes::$references)]; - return $this->getReference($ref); + return $this->getReference($ref, Scope::class); } /** diff --git a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php index cb38df91c..23043d1e9 100644 --- a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php +++ b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php @@ -13,7 +13,9 @@ namespace Chill\TaskBundle\DataFixtures\ORM; use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; +use Chill\MainBundle\Entity\PermissionsGroup; use Chill\MainBundle\Entity\RoleScope; +use Chill\MainBundle\Entity\Scope; use Chill\TaskBundle\Security\Authorization\TaskVoter; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; @@ -25,18 +27,18 @@ use Doctrine\Persistence\ObjectManager; */ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface { - public function getOrder() + public function getOrder(): int { return 16000; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) { - $permissionsGroup = $this->getReference($permissionsGroupRef); + $permissionsGroup = $this->getReference($permissionsGroupRef, PermissionsGroup::class); foreach (LoadScopes::$references as $scopeRef) { - $scope = $this->getReference($scopeRef); + $scope = $this->getReference($scopeRef, Scope::class); // create permission group switch ($permissionsGroup->getName()) { case 'social': diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php index 7261deba4..dc4b5472b 100644 --- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php +++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php @@ -14,6 +14,7 @@ namespace Chill\ThirdPartyBundle\DataFixtures\ORM; use Chill\MainBundle\DataFixtures\ORM\LoadCenters; use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes; use Chill\MainBundle\Entity\Address; +use Chill\MainBundle\Entity\Center; use Chill\MainBundle\Entity\PostalCode; use Chill\ThirdPartyBundle\Entity\ThirdParty; use Doctrine\Bundle\FixturesBundle\Fixture; @@ -32,7 +33,7 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface $this->phoneNumberUtil = PhoneNumberUtil::getInstance(); } - public function getDependencies() + public function getDependencies(): array { return [ LoadCenters::class, @@ -40,7 +41,7 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface ]; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $thirdParties = $this->getThirdParties()->getObjects(); @@ -70,10 +71,10 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface $number = random_int(1, \count($references)); if (1 === $number) { - yield $this->getReference($references[array_rand($references)]); + yield $this->getReference($references[array_rand($references)], Center::class); } else { foreach (array_rand($references, $number) as $index) { - yield $this->getReference($references[$index]); + yield $this->getReference($references[$index], Center::class); } } } @@ -82,7 +83,7 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface { $ref = LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]; - return $this->getReference($ref); + return $this->getReference($ref, PostalCode::class); } private function getThirdParties(): ObjectSet diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php index 061c85a4a..e90ccd130 100644 --- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php +++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php @@ -26,7 +26,7 @@ class LoadThirdPartyCategory extends Fixture implements FixtureGroupInterface return ['thirdparty_categories']; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $categories = [ ['name' => ['fr' => 'maison médicale']], diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php index 265a773cb..0442f05ef 100644 --- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php +++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php @@ -26,7 +26,7 @@ class LoadThirdPartyProfession extends Fixture implements FixtureGroupInterface return ['thirdparty_professions']; } - public function load(ObjectManager $manager) + public function load(ObjectManager $manager): void { $professions = [ ['name' => ['fr' => 'Directeur']],