fix cs

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -46,6 +46,7 @@ use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use UnexpectedValueException;
 use function count;
 use function in_array;
 
@@ -182,21 +183,23 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's center.
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
+     *
      * @deprecated
      */
     private ?Center $center = null;
 
-    /**
-     * @ORM\OneToMany(targetEntity=PersonCenterHistory::class, mappedBy="person", cascade={"persist"})
-     * @var Collection|PersonCenterHistory[]
-     */
-    private Collection $centerHistory;
-
     /**
      * @ORM\OneToOne(targetEntity=PersonCenterCurrent::class, mappedBy="person")
      */
     private ?PersonCenterCurrent $centerCurrent = null;
 
+    /**
+     * @ORM\OneToMany(targetEntity=PersonCenterHistory::class, mappedBy="person", cascade={"persist"})
+     *
+     * @var Collection|PersonCenterHistory[]
+     */
+    private Collection $centerHistory;
+
     /**
      * Array where customfield's data are stored.
      *
@@ -910,32 +913,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->budgetResources;
     }
 
-    private function getCurrentCenterHistory(): ?PersonCenterHistory
-    {
-        if (0 === $this->centerHistory->count()) {
-            return null;
-        }
-
-        $criteria = Criteria::create();
-        $now = new DateTimeImmutable('now');
-        $criteria->where(Criteria::expr()->lte('startDate', $now))
-            ->andWhere(Criteria::expr()->orX(
-                Criteria::expr()->isNull('endDate'),
-                Criteria::expr()->gt('endDate', $now)
-            ));
-
-        $histories = $this->centerHistory->matching($criteria);
-
-        switch ($histories->count()) {
-            case 0:
-                return null;
-            case 1:
-                return $histories->first();
-            default:
-                throw new \UnexpectedValueException('It should not contains more than one center at a time');
-        }
-    }
-
     public function getCenter(): ?Center
     {
         if (null !== $this->centerCurrent) {
@@ -949,6 +926,24 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $currentCenterHistory->getCenter();
     }
 
+    public function getCenterCurrent(): ?PersonCenterCurrent
+    {
+        if (null !== $this->centerCurrent) {
+            return $this->centerCurrent;
+        }
+
+        if (null === $currentCenterHistory = $this->getCurrentCenterHistory()) {
+            return null;
+        }
+
+        return new PersonCenterCurrent($currentCenterHistory);
+    }
+
+    public function getCenterHistory(): Collection
+    {
+        return $this->centerHistory;
+    }
+
     public function getCFData(): ?array
     {
         if (null === $this->cFData) {
@@ -1562,7 +1557,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Associate the center with the person. The association start on 'now'.
      *
-     * @param Center $center
      * @return $this
      */
     public function setCenter(Center $center): self
@@ -1582,40 +1576,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * @return Collection
-     */
-    public function getCenterHistory(): Collection
-    {
-        return $this->centerHistory;
-    }
-
-    /**
-     * @param Collection $centerHistory
-     * @return Person
-     */
     public function setCenterHistory(Collection $centerHistory): Person
     {
         $this->centerHistory = $centerHistory;
+
         return $this;
     }
 
-    /**
-     * @return PersonCenterCurrent|null
-     */
-    public function getCenterCurrent(): ?PersonCenterCurrent
-    {
-        if (null !== $this->centerCurrent) {
-            return $this->centerCurrent;
-        }
-
-        if (null === $currentCenterHistory = $this->getCurrentCenterHistory()) {
-            return null;
-        }
-
-        return new PersonCenterCurrent($currentCenterHistory);
-    }
-
     /**
      * @return Person
      */
@@ -1818,6 +1785,34 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
+    private function getCurrentCenterHistory(): ?PersonCenterHistory
+    {
+        if (0 === $this->centerHistory->count()) {
+            return null;
+        }
+
+        $criteria = Criteria::create();
+        $now = new DateTimeImmutable('now');
+        $criteria->where(Criteria::expr()->lte('startDate', $now))
+            ->andWhere(Criteria::expr()->orX(
+                Criteria::expr()->isNull('endDate'),
+                Criteria::expr()->gt('endDate', $now)
+            ));
+
+        $histories = $this->centerHistory->matching($criteria);
+
+        switch ($histories->count()) {
+            case 0:
+                return null;
+
+            case 1:
+                return $histories->first();
+
+            default:
+                throw new UnexpectedValueException('It should not contains more than one center at a time');
+        }
+    }
+
     /**
      * This private function scan accompanyingPeriodParticipations Collection,
      * searching for a given AccompanyingPeriod.

src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php

@@ -1,15 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\Person;
 
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeInterface;
+use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -24,6 +28,16 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class PersonCenterCurrent
 {
+    /**
+     * @ORM\ManyToOne(targetEntity=Center::class)
+     */
+    private Center $center;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     */
+    private ?DateTimeImmutable $endDate = null;
+
     /**
      * @ORM\Id
      * @ORM\Column(type="integer")
@@ -35,20 +49,10 @@ class PersonCenterCurrent
      */
     private Person $person;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=Center::class)
-     */
-    private Center $center;
-
     /**
      * @ORM\Column(type="date_immutable", nullable=false)
      */
-    private \DateTimeImmutable $startDate;
-
-    /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     */
-    private ?\DateTimeImmutable $endDate = null;
+    private DateTimeImmutable $startDate;
 
     /**
      * Populate the properties person, center, start and end date from history.
@@ -56,7 +60,6 @@ class PersonCenterCurrent
      * The creator and updatedby are not filled.
      *
      * @internal Should not be instantied, unless inside Person entity
-     * @param PersonCenterHistory $history
      */
     public function __construct(PersonCenterHistory $history)
     {
@@ -67,46 +70,31 @@ class PersonCenterCurrent
         $this->id = $history->getId();
     }
 
+    public function getCenter(): Center
+    {
+        return $this->center;
+    }
+
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
     /**
-     * The id will be the same as the current @link{PersonCenterHistory::class}
-     *
-     * @return int
+     * The id will be the same as the current @see{PersonCenterHistory::class}.
      */
     public function getId(): int
     {
         return $this->id;
     }
 
-    /**
-     * @return Person
-     */
     public function getPerson(): Person
     {
         return $this->person;
     }
 
-    /**
-     * @return Center
-     */
-    public function getCenter(): Center
-    {
-        return $this->center;
-    }
-
-    /**
-     * @return \DateTimeImmutable
-     */
-    public function getStartDate(): \DateTimeImmutable
+    public function getStartDate(): DateTimeImmutable
     {
         return $this->startDate;
     }
-
-    /**
-     * @return \DateTimeImmutable|null
-     */
-    public function getEndDate(): ?\DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
 }

src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
@@ -8,10 +17,11 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
 use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Associate a Person with a Center. The association may change on date intervals
+ * Associate a Person with a Center. The association may change on date intervals.
  *
  * @ORM\Entity
  * @ORM\Table(name="chill_person_person_center_history")
@@ -19,8 +29,19 @@ use Doctrine\ORM\Mapping as ORM;
 class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
+
     use TrackUpdateTrait;
 
+    /**
+     * @ORM\ManyToOne(targetEntity=Center::class)
+     */
+    private ?Center $center = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     */
+    private ?DateTimeImmutable $endDate = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -33,71 +54,43 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
      */
     private ?Person $person = null;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=Center::class)
-     */
-    private ?Center $center = null;
-
     /**
      * @ORM\Column(type="date_immutable", nullable=false)
      */
-    private ?\DateTimeImmutable $startDate = null;
+    private ?DateTimeImmutable $startDate = null;
 
-    /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     */
-    private ?\DateTimeImmutable $endDate = null;
-
-    /**
-     * @param Person|null $person
-     * @param Center|null $center
-     * @param \DateTimeImmutable|null $startDate
-     */
-    public function __construct(?Person $person = null, ?Center $center = null, ?\DateTimeImmutable $startDate = null)
+    public function __construct(?Person $person = null, ?Center $center = null, ?DateTimeImmutable $startDate = null)
     {
         $this->person = $person;
         $this->center = $center;
         $this->startDate = $startDate;
     }
 
-
-    /**
-     * @return int|null
-     */
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return Person|null
-     */
-    public function getPerson(): ?Person
-    {
-        return $this->person;
-    }
-
-    /**
-     * @param Person|null $person
-     */
-    public function setPerson(?Person $person): self
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
-    /**
-     * @return Center|null
-     */
     public function getCenter(): ?Center
     {
         return $this->center;
     }
 
-    /**
-     * @param Center|null $center
-     */
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getStartDate(): ?DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
     public function setCenter(?Center $center): self
     {
         $this->center = $center;
@@ -105,38 +98,24 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         return $this;
     }
 
-    /**
-     * @return \DateTimeImmutable|null
-     */
-    public function getStartDate(): ?\DateTimeImmutable
-    {
-        return $this->startDate;
-    }
-
-    /**
-     * @param \DateTimeImmutable|null $startDate
-     */
-    public function setStartDate(?\DateTimeImmutable $startDate): self
-    {
-        $this->startDate = $startDate;
-        return $this;
-    }
-
-    /**
-     * @return \DateTimeImmutable|null
-     */
-    public function getEndDate(): ?\DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
-    /**
-     * @param \DateTimeImmutable|null $endDate
-     */
-    public function setEndDate(?\DateTimeImmutable $endDate): self
+    public function setEndDate(?DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
         return $this;
     }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    public function setStartDate(?DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
 }