Adds to emergency log message the registrant IP

[userbundle] / Entity / Civility.php

diff --git a/Entity/Civility.php b/Entity/Civility.php
index 9ec56e9053f16b299b72772195313401725fbb54..e86b47e8b1ae614fa9aa7d3396f6e4ba129db13b 100644 (file)
--- a/Entity/Civility.php
+++ b/Entity/Civility.php
@@ -11,6 +11,7 @@
 
 namespace Rapsys\UserBundle\Entity;
 
 
 namespace Rapsys\UserBundle\Entity;
 

+use Doctrine\Common\Collections\Collection;

 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 


@@ -21,40 +22,36 @@ use Rapsys\UserBundle\Entity\User;
  */
 class Civility {
        /**
  */
 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
         */
 
        /**
         * Constructor
         *
         * @param string $title The civility name
         */

-       public function __construct(string $title) {
+       public function __construct(protected string $title) {

                //Set defaults
                //Set defaults

-               $this->title = $title;

                $this->created = new \DateTime('now');
                $this->updated = new \DateTime('now');
                $this->created = new \DateTime('now');
                $this->updated = new \DateTime('now');

+
+               //Set collections

                $this->users = new ArrayCollection();
        }
 
                $this->users = new ArrayCollection();
        }
 


@@ -63,7 +60,7 @@ class Civility {
         *
         * @return integer
         */
         *
         * @return integer
         */

-       public function getId(): int {
+       public function getId(): ?int {

                return $this->id;
        }
 
                return $this->id;
        }
 


@@ -169,7 +166,7 @@ class Civility {
         */
        public function preUpdate(PreUpdateEventArgs $eventArgs) {
                //Check that we have a civility instance
         */
        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'));
                }
                        //Set updated value
                        $user->setUpdated(new \DateTime('now'));
                }