X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/ea9b00a8025f8bbe7a1c28399f7538bea6d60a2c..4552b1166b82f694e01a6cf0ee59272a4d7654b7:/Entity/Group.php?ds=sidebyside

diff --git a/Entity/Group.php b/Entity/Group.php
index 188e1bc..670e5b7 100644
--- a/Entity/Group.php
+++ b/Entity/Group.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 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) {
-		$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 Group {
 	 *
 	 * @return integer
 	 */
-	public function getId(): int {
+	public function getId(): ?int {
 		return $this->id;
 	}
 
@@ -82,7 +82,7 @@ class Group {
 	 *
 	 * @return string
 	 */
-	public function getTitle(): ?string {
+	public function getTitle(): string {
 		return $this->title;
 	}
 
@@ -166,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'));
 		}
@@ -187,6 +187,7 @@ class Group {
 	 * @return string
 	 */
 	public function getRole(): string {
+		//XXX: $prefix = 'ROLE_' set in Role*Voter classes
 		return 'ROLE_'.strtoupper($this->title);
 	}
 }