From: Raphaël Gertz <git@rapsys.eu>
Date: Tue, 23 Feb 2021 23:08:37 +0000 (+0100)
Subject: Rename title in civility
X-Git-Tag: 0.1.6~5
X-Git-Url: https://git.rapsys.eu/userbundle/commitdiff_plain/ff832b7380916c7d63401978ca6b39bd2a35ef39?ds=sidebyside;hp=34d5b979dc34fbbd89e3f321024a1a79718d0e6e

Rename title in civility
---

diff --git a/Entity/Title.php b/Entity/Civility.php
similarity index 94%
rename from Entity/Title.php
rename to Entity/Civility.php
index bcaf785..83c7f47 100644
--- a/Entity/Title.php
+++ b/Entity/Civility.php
@@ -3,9 +3,9 @@
 namespace Rapsys\UserBundle\Entity;
 
 /**
- * Title
+ * Civility
  */
-class Title {
+class Civility {
 	/**
 	 * @var integer
 	 */
@@ -52,7 +52,7 @@ class Title {
 	 *
 	 * @param string $title
 	 *
-	 * @return Title
+	 * @return Civility
 	 */
 	public function setTitle($title) {
 		$this->title = $title;
@@ -74,7 +74,7 @@ class Title {
 	 *
 	 * @param \DateTime $created
 	 *
-	 * @return Title
+	 * @return Civility
 	 */
 	public function setCreated($created) {
 		$this->created = $created;
@@ -96,7 +96,7 @@ class Title {
 	 *
 	 * @param \DateTime $updated
 	 *
-	 * @return Title
+	 * @return Civility
 	 */
 	public function setUpdated($updated) {
 		$this->updated = $updated;
@@ -118,7 +118,7 @@ class Title {
 	 *
 	 * @param \Rapsys\UserBundle\Entity\User $user
 	 *
-	 * @return Title
+	 * @return Civility
 	 */
 	public function addUser(\Rapsys\UserBundle\Entity\User $user) {
 		$this->users[] = $user;
diff --git a/Entity/User.php b/Entity/User.php
index 8286e55..6d10f33 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -6,7 +6,7 @@ namespace Rapsys\UserBundle\Entity;
 use Rapsys\UserBundle\Entity\Group;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Doctrine\Common\Collections\ArrayCollection;
-use Rapsys\UserBundle\Entity\Title;
+use Rapsys\UserBundle\Entity\Civility;
 
 class User implements UserInterface, \Serializable {
 	/**
@@ -55,9 +55,9 @@ class User implements UserInterface, \Serializable {
 	protected $updated;
 
 	/**
-	 * @var \Rapsys\UserBundle\Entity\Title
+	 * @var \Rapsys\UserBundle\Entity\Civility
 	 */
-	protected $title;
+	protected $civility;
 
 	/**
 	 * @var \Doctrine\Common\Collections\Collection
@@ -260,19 +260,19 @@ class User implements UserInterface, \Serializable {
 	}
 
 	/**
-	 * Set title
+	 * Set civility
 	 */
-	public function setTitle(Title $title) {
-		$this->title = $title;
+	public function setCivility(Civility $civility) {
+		$this->civility = $civility;
 
 		return $this;
 	}
 
 	/**
-	 * Get title
+	 * Get civility
 	 */
-	public function getTitle(): Title {
-		return $this->title;
+	public function getCivility(): Civility {
+		return $this->civility;
 	}
 
 	/**
@@ -326,6 +326,9 @@ class User implements UserInterface, \Serializable {
 		));
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function getRole() {
 		//Retrieve roles
 		$roles = $this->getRoles();
@@ -403,6 +406,6 @@ class User implements UserInterface, \Serializable {
 	 * @return string
 	 */
 	public function __toString(): string {
-		return $this->title.' '.$this->forename.' '.$this->surname;
+		return $this->civility.' '.$this->forename.' '.$this->surname;
 	}
 }
diff --git a/Resources/config/doctrine/Title.orm.yml b/Resources/config/doctrine/Civility.orm.yml
similarity index 92%
rename from Resources/config/doctrine/Title.orm.yml
rename to Resources/config/doctrine/Civility.orm.yml
index 85354a0..a175fa8 100644
--- a/Resources/config/doctrine/Title.orm.yml
+++ b/Resources/config/doctrine/Civility.orm.yml
@@ -1,4 +1,4 @@
-Rapsys\UserBundle\Entity\Title:
+Rapsys\UserBundle\Entity\Civility:
     type: mappedSuperclass
     id:
         id: