Cleanup

[userbundle] / Entity / Civility.php

diff --git a/Entity/Civility.php b/Entity/Civility.php
index 4d2671a1dee821fd8e44bd25fa1288dd52f24e64..e86b47e8b1ae614fa9aa7d3396f6e4ba129db13b 100644 (file)
--- a/Entity/Civility.php
+++ b/Entity/Civility.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * This file is part of the Rapsys PackBundle package.
+ * This file is part of the Rapsys UserBundle package.
  *
  * (c) Raphaël Gertz <symfony@rapsys.eu>
  *
@@ -11,6 +11,7 @@
 
 namespace Rapsys\UserBundle\Entity;
 
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 
@@ -21,37 +22,36 @@ use Rapsys\UserBundle\Entity\User;
  */
 class Civility {
        /**
-        * @var integer
+        * Primary key
         */
-       protected $id;
+       protected ?int $id = null;
 
        /**
-        * @var string
+        * Create datetime
         */
-       protected $title;
+       protected \DateTime $created;
 
        /**
-        * @var \DateTime
+        * Update datetime
         */
-       protected $created;
+       protected \DateTime $updated;
 
        /**
-        * @var \DateTime
+        * Users collection
         */
-       protected $updated;
-
-       /**
-        * @var ArrayCollection
-        */
-       protected $users;
+       protected Collection $users;
 
        /**
         * Constructor
         *
         * @param string $title The civility name
         */
-       public function __construct(string $title) {
-               $this->title = $title;
+       public function __construct(protected string $title) {
+               //Set defaults
+               $this->created = new \DateTime('now');
+               $this->updated = new \DateTime('now');
+
+               //Set collections
                $this->users = new ArrayCollection();
        }
 
@@ -60,7 +60,7 @@ class Civility {
         *
         * @return integer
         */
-       public function getId(): int {
+       public function getId(): ?int {
                return $this->id;
        }
 
@@ -166,7 +166,7 @@ class Civility {
         */
        public function preUpdate(PreUpdateEventArgs $eventArgs) {
                //Check that we have a civility instance
-               if (($user = $eventArgs->getEntity()) instanceof Civility) {
+               if (($user = $eventArgs->getObject()) instanceof Civility) {
                        //Set updated value
                        $user->setUpdated(new \DateTime('now'));
                }