X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/0929c559670ac8d386a047789712e6164a640326..830512510b2cc0d7d6aeab793bf63a250f00df9b:/Entity/Group.php

diff --git a/Entity/Group.php b/Entity/Group.php
index c97515c..670e5b7 100644
--- a/Entity/Group.php
+++ b/Entity/Group.php
@@ -11,6 +11,7 @@
 
 namespace Rapsys\UserBundle\Entity;
 
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 
@@ -21,40 +22,36 @@ use Rapsys\UserBundle\Entity\User;
  */
 class Group {
 	/**
-	 * @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 group name
 	 */
-	public function __construct(string $title) {
+	public function __construct(protected string $title) {
 		//Set defaults
-		$this->title = $title;
 		$this->created = new \DateTime('now');
 		$this->updated = new \DateTime('now');
+
+		//Set collections
 		$this->users = new ArrayCollection();
 	}
 
@@ -63,7 +60,7 @@ class Group {
 	 *
 	 * @return integer
 	 */
-	public function getId(): int {
+	public function getId(): ?int {
 		return $this->id;
 	}
 
@@ -85,7 +82,7 @@ class Group {
 	 *
 	 * @return string
 	 */
-	public function getTitle(): ?string {
+	public function getTitle(): string {
 		return $this->title;
 	}
 
@@ -169,7 +166,7 @@ class Group {
 	 */
 	public function preUpdate(PreUpdateEventArgs $eventArgs) {
 		//Check that we have a group instance
-		if (($user = $eventArgs->getEntity()) instanceof Group) {
+		if (($user = $eventArgs->getObject()) instanceof Group) {
 			//Set updated value
 			$user->setUpdated(new \DateTime('now'));
 		}
@@ -190,6 +187,7 @@ class Group {
 	 * @return string
 	 */
 	public function getRole(): string {
+		//XXX: $prefix = 'ROLE_' set in Role*Voter classes
 		return 'ROLE_'.strtoupper($this->title);
 	}
 }