diff --git a/src/Bundle/ChillMainBundle/Entity/Civility.php b/src/Bundle/ChillMainBundle/Entity/Civility.php index 3b832aede..431ca6428 100644 --- a/src/Bundle/ChillMainBundle/Entity/Civility.php +++ b/src/Bundle/ChillMainBundle/Entity/Civility.php @@ -32,11 +32,6 @@ class Civility */ private bool $active = true; - /** - * @ORM\Column(type="integer", nullable=true) - */ - private ?int $order = null; - /** * @ORM\Id * @ORM\GeneratedValue @@ -52,6 +47,11 @@ class Civility */ private array $name = []; + /** + * @ORM\Column(type="integer", nullable=true) + */ + private ?int $order = null; + public function getAbbreviation(): array { return $this->abbreviation; @@ -67,16 +67,16 @@ class Civility return $this->id; } - public function getOrder(): ?int - { - return $this->order; - } - public function getName(): ?array { return $this->name; } + public function getOrder(): ?int + { + return $this->order; + } + /** * @return Civility */ @@ -94,17 +94,17 @@ class Civility return $this; } - public function setOrder(int $order): self - { - $this->order = $order; - - return $this; - } - public function setName(array $name): self { $this->name = $name; return $this; } + + public function setOrder(int $order): self + { + $this->order = $order; + + return $this; + } } diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php b/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php index 905a24048..4cacd9478 100644 --- a/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php +++ b/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php @@ -1,5 +1,12 @@