Rename default controller to user controller

[userbundle] / Entity / Civility.php

diff --git a/Entity/Civility.php b/Entity/Civility.php
index 83c7f47ef4b1d7359452c0108291a6c0207d0df9..9ec56e9053f16b299b72772195313401725fbb54 100644 (file)
--- a/Entity/Civility.php
+++ b/Entity/Civility.php
@@ -1,7 +1,21 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys UserBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */

 
 namespace Rapsys\UserBundle\Entity;
 
 
 namespace Rapsys\UserBundle\Entity;
 

+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Event\PreUpdateEventArgs;
+
+use Rapsys\UserBundle\Entity\User;
+

 /**
  * Civility
  */
 /**
  * Civility
  */


@@ -27,15 +41,21 @@ class Civility {
        protected $updated;
 
        /**
        protected $updated;
 
        /**

-        * @var \Doctrine\Common\Collections\Collection
+        * @var ArrayCollection

         */
        protected $users;
 
        /**
         * Constructor
         */
        protected $users;
 
        /**
         * Constructor

+        *
+        * @param string $title The civility name

         */
         */

-       public function __construct() {
-               $this->users = new \Doctrine\Common\Collections\ArrayCollection();
+       public function __construct(string $title) {
+               //Set defaults
+               $this->title = $title;
+               $this->created = new \DateTime('now');
+               $this->updated = new \DateTime('now');
+               $this->users = new ArrayCollection();

        }
 
        /**
        }
 
        /**


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

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

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


@@ -54,7 +74,7 @@ class Civility {
         *
         * @return Civility
         */
         *
         * @return Civility
         */

-       public function setTitle($title) {
+       public function setTitle(string $title): Civility {

                $this->title = $title;
 
                return $this;
                $this->title = $title;
 
                return $this;


@@ -65,7 +85,7 @@ class Civility {
         *
         * @return string
         */
         *
         * @return string
         */

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

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


@@ -76,7 +96,7 @@ class Civility {
         *
         * @return Civility
         */
         *
         * @return Civility
         */

-       public function setCreated($created) {
+       public function setCreated(\DateTime $created): Civility {

                $this->created = $created;
 
                return $this;
                $this->created = $created;
 
                return $this;


@@ -87,7 +107,7 @@ class Civility {
         *
         * @return \DateTime
         */
         *
         * @return \DateTime
         */

-       public function getCreated() {
+       public function getCreated(): \DateTime {

                return $this->created;
        }
 
                return $this->created;
        }
 


@@ -98,7 +118,7 @@ class Civility {
         *
         * @return Civility
         */
         *
         * @return Civility
         */

-       public function setUpdated($updated) {
+       public function setUpdated(\DateTime $updated): Civility {

                $this->updated = $updated;
 
                return $this;
                $this->updated = $updated;
 
                return $this;


@@ -109,18 +129,18 @@ class Civility {
         *
         * @return \DateTime
         */
         *
         * @return \DateTime
         */

-       public function getUpdated() {
+       public function getUpdated(): \DateTime {

                return $this->updated;
        }
 
        /**
         * Add user
         *
                return $this->updated;
        }
 
        /**
         * Add user
         *

-        * @param \Rapsys\UserBundle\Entity\User $user
+        * @param User $user

         *
         * @return Civility
         */
         *
         * @return Civility
         */

-       public function addUser(\Rapsys\UserBundle\Entity\User $user) {
+       public function addUser(User $user): Civility {

                $this->users[] = $user;
 
                return $this;
                $this->users[] = $user;
 
                return $this;


@@ -129,21 +149,32 @@ class Civility {
        /**
         * Remove user
         *
        /**
         * Remove user
         *

-        * @param \Rapsys\UserBundle\Entity\User $user
+        * @param User $user

         */
         */

-       public function removeUser(\Rapsys\UserBundle\Entity\User $user) {
+       public function removeUser(User $user) {

                $this->users->removeElement($user);
        }
 
        /**
         * Get users
         *
                $this->users->removeElement($user);
        }
 
        /**
         * Get users
         *

-        * @return \Doctrine\Common\Collections\Collection
+        * @return ArrayCollection

         */
         */

-       public function getUsers() {
+       public function getUsers(): ArrayCollection {

                return $this->users;
        }
 
                return $this->users;
        }
 

+       /**
+        * {@inheritdoc}
+        */
+       public function preUpdate(PreUpdateEventArgs $eventArgs) {
+               //Check that we have a civility instance
+               if (($user = $eventArgs->getEntity()) instanceof Civility) {
+                       //Set updated value
+                       $user->setUpdated(new \DateTime('now'));
+               }
+       }
+

        /**
         * Returns a string representation of the title
         *
        /**
         * Returns a string representation of the title
         *