Cleanup

[userbundle] / Entity / Group.php

diff --git a/Entity/Group.php b/Entity/Group.php
index 188e1bce5c188e851047706041cb81285040687d..d1550026cbdfc986c58f7b2066b333ec46b05fcc 100644 (file)
--- a/Entity/Group.php
+++ b/Entity/Group.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
 <?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>
  *
  *
  * (c) Raphaël Gertz <symfony@rapsys.eu>
  *


@@ -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;
 


@@ -23,35 +24,32 @@ class Group {
        /**
         * @var integer
         */
        /**
         * @var integer
         */

-       protected $id;
-
-       /**
-        * @var string
-        */
-       protected $title;
+       protected int $id;

 
        /**
         * @var \DateTime
         */
 
        /**
         * @var \DateTime
         */

-       protected $created;
+       protected \DateTime $created;

 
        /**
         * @var \DateTime
         */
 
        /**
         * @var \DateTime
         */

-       protected $updated;
+       protected \DateTime $updated;

 
        /**
         * @var ArrayCollection
         */
 
        /**
         * @var ArrayCollection
         */

-       protected $users;
+       protected Collection $users;

 
        /**
         * Constructor
         *
         * @param string $title The group name
         */
 
        /**
         * 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');

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


@@ -82,7 +80,7 @@ class Group {
         *
         * @return string
         */
         *
         * @return string
         */

-       public function getTitle(): ?string {
+       public function getTitle(): string {

                return $this->title;
        }
 
                return $this->title;
        }
 


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


@@ -187,6 +185,7 @@ class Group {
         * @return string
         */
        public function getRole(): string {
         * @return string
         */
        public function getRole(): string {

+               //XXX: $prefix = 'ROLE_' set in Role*Voter classes

                return 'ROLE_'.strtoupper($this->title);
        }
 }
                return 'ROLE_'.strtoupper($this->title);
        }
 }