DX: type-hing oneToMany and ManyToMany properties as collection

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Entity;
 use ArrayIterator;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Entity\Resource;
+use Chill\CalendarBundle\Entity\Calendar;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\Address;
@@ -22,6 +23,7 @@ use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\Language;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use Chill\PersonBundle\Entity\Household\Household;
@@ -110,14 +112,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's accompanying periods (when the person was accompanied by the center).
      *
-     * @var Collection
+     * @var Collection<AccompanyingPeriodParticipation>
      *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
      *     mappedBy="person",
      * cascade={"persist", "remove", "merge", "detach"})
      * @ORM\OrderBy({"startDate": "DESC"})
      */
-    private $accompanyingPeriodParticipations;
+    private Collection $accompanyingPeriodParticipations;
 
     /**
      * The accompanying period requested by the Person.
@@ -125,14 +127,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\OneToMany(targetEntity=AccompanyingPeriod::class,
      * mappedBy="requestorPerson")
      *
-     * @var AccompanyingPeriod[]|Collection
+     * @var Collection<AccompanyingPeriod>
      */
     private Collection $accompanyingPeriodRequested;
 
     /**
      * Addresses.
      *
-     * @var Collection
+     * @var Collection<Address>
      *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\Address",
@@ -140,10 +142,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\JoinTable(name="chill_person_persons_to_addresses")
      * @ORM\OrderBy({"validFrom": "DESC"})
      */
-    private $addresses;
+    private Collection $addresses;
 
     /**
-     * @var Collection
+     * @var Collection<PersonAltName>
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\PersonAltName",
@@ -151,7 +153,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     cascade={"persist", "remove", "merge", "detach"},
      * orphanRemoval=true)
      */
-    private $altNames;
+    private Collection $altNames;
 
     /**
      * The person's birthdate.
@@ -164,6 +166,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private $birthdate;
 
     /**
+     * @var Collection<Charge>
      * @ORM\OneToMany(
      *     targetEntity=Charge::class,
      *     mappedBy="person"
@@ -172,6 +175,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private Collection $budgetCharges;
 
     /**
+     * @var Collection<Resource>
      * @ORM\OneToMany(
      *     targetEntity=Resource::class,
      *     mappedBy="person"
@@ -180,6 +184,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private Collection $budgetResources;
 
     /**
+     * @var Collection<Calendar>
      * @ORM\ManyToMany(
      *     targetEntity="Chill\CalendarBundle\Entity\Calendar",
      *     mappedBy="persons"
@@ -204,7 +209,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * @ORM\OneToMany(targetEntity=PersonCenterHistory::class, mappedBy="person", cascade={"persist"})
      *
-     * @var Collection|PersonCenterHistory[]
+     * @var Collection<PersonCenterHistory>
      */
     private Collection $centerHistory;
 
@@ -342,6 +347,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Read-only field, computed by the database.
      *
+     * @var Collection<PersonHouseholdAddress>
      * @ORM\OneToMany(
      *     targetEntity=PersonHouseholdAddress::class,
      *     mappedBy="person"
@@ -355,7 +361,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     mappedBy="person"
      * )
      *
-     * @var Collection|HouseholdMember[]
+     * @var Collection<HouseholdMember>
      */
     private Collection $householdParticipations;
 
@@ -446,7 +452,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private ?int $numberOfChildren = null;
 
     /**
-     * @var Collection
+     * @var Collection<PersonPhone>
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\PersonPhone",
@@ -458,13 +464,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     traverse=true,
      * )
      */
-    private $otherPhoneNumbers;
+    private Collection $otherPhoneNumbers;
 
     /**
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriod::class,
      *     mappedBy="personLocation"
      * )
+     * @var Collection<AccompanyingPeriod>
      */
     private Collection $periodLocatedOn;
 
@@ -499,14 +506,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * @ORM\OneToMany(targetEntity=PersonResource::class, mappedBy="personOwner")
      *
-     * @var Collection|PersonResource[];
+     * @var Collection<PersonResource>
      */
     private Collection $resources;
 
     /**
      * The person's spoken languages.
      *
-     * @var ArrayCollection
+     * @var Collection<Language>
      *
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\Language")
      * @ORM\JoinTable(
@@ -515,7 +522,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     inverseJoinColumns={@ORM\JoinColumn(name="language_id", referencedColumnName="id")}
      * )
      */
-    private $spokenLanguages;
+    private Collection $spokenLanguages;
 
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
@@ -1361,7 +1368,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Get spokenLanguages.
      *
-     * @return ArrayCollection
+     * @return Collection<Language>
      */
     public function getSpokenLanguages()
     {