X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/c1f01e64c377c59b3825e80661f60d250363250b..038e583ee27e5e1fe587c4798d5dcc7d831be5a8:/Entity/User.php?ds=sidebyside
diff --git a/Entity/User.php b/Entity/User.php
index 5df315a..4393db6 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -1,13 +1,26 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * this file is part of the rapsys packbundle 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.
+ */
-// src/Rapsys/UserBundle/Entity/User.php
namespace Rapsys\UserBundle\Entity;
-use Rapsys\UserBundle\Entity\Group;
-use Symfony\Component\Security\Core\User\UserInterface;
use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Event\PreUpdateEventArgs;
+use Symfony\Component\Security\Core\User\UserInterface;
+
use Rapsys\UserBundle\Entity\Civility;
+use Rapsys\UserBundle\Entity\Group;
+/**
+ * User
+ */
class User implements UserInterface, \Serializable {
/**
* @var integer
@@ -19,11 +32,6 @@ class User implements UserInterface, \Serializable {
*/
protected $mail;
- /**
- * @var string
- */
- protected $pseudonym;
-
/**
* @var string
*/
@@ -60,21 +68,37 @@ class User implements UserInterface, \Serializable {
protected $updated;
/**
- * @var \Rapsys\UserBundle\Entity\Civility
+ * @var Civility
*/
protected $civility;
/**
- * @var \Doctrine\Common\Collections\ArrayCollection
+ * @var ArrayCollection
*/
protected $groups;
/**
* Constructor
+ *
+ * @param string $mail The user mail
*/
- public function __construct() {
+ public function __construct(string $mail) {
+ //With mail
+ if (!empty($this->mail = $mail)) {
+ $this->password = $mail;
+ } else {
+ $this->password = '';
+ }
+
+ //Set defaults
+ $this->forename = '';
+ $this->surname = '';
$this->active = false;
$this->disabled = false;
+ $this->created = new \DateTime('now');
+ $this->updated = new \DateTime('now');
+
+ //Set collections
$this->groups = new ArrayCollection();
}
@@ -94,8 +118,15 @@ class User implements UserInterface, \Serializable {
*
* @return User
*/
- public function setMail(string $mail) {
- $this->mail = $mail;
+ public function setMail(string $mail): User {
+ //With mail
+ if (!empty($this->mail = $mail)) {
+ //Without password
+ if (empty($this->password)) {
+ //Set mail as password
+ $this->password = $mail;
+ }
+ }
return $this;
}
@@ -105,32 +136,10 @@ class User implements UserInterface, \Serializable {
*
* @return string
*/
- public function getMail(): ?string {
+ public function getMail(): string {
return $this->mail;
}
- /**
- * Set pseudonym
- *
- * @param string $pseudonym
- *
- * @return User
- */
- public function setPseudonym(string $pseudonym) {
- $this->pseudonym = $pseudonym;
-
- return $this;
- }
-
- /**
- * Get pseudonym
- *
- * @return string
- */
- public function getPseudonym(): ?string {
- return $this->pseudonym;
- }
-
/**
* Set forename
*
@@ -138,7 +147,7 @@ class User implements UserInterface, \Serializable {
*
* @return User
*/
- public function setForename(string $forename) {
+ public function setForename(string $forename): User {
$this->forename = $forename;
return $this;
@@ -149,7 +158,7 @@ class User implements UserInterface, \Serializable {
*
* @return string
*/
- public function getForename(): ?string {
+ public function getForename(): string {
return $this->forename;
}
@@ -160,7 +169,7 @@ class User implements UserInterface, \Serializable {
*
* @return User
*/
- public function setSurname(string $surname) {
+ public function setSurname(string $surname): User {
$this->surname = $surname;
return $this;
@@ -171,7 +180,7 @@ class User implements UserInterface, \Serializable {
*
* @return string
*/
- public function getSurname(): ?string {
+ public function getSurname(): string {
return $this->surname;
}
@@ -182,7 +191,7 @@ class User implements UserInterface, \Serializable {
*
* @return User
*/
- public function setPassword(string $password) {
+ public function setPassword(string $password): User {
$this->password = $password;
return $this;
@@ -206,7 +215,7 @@ class User implements UserInterface, \Serializable {
*
* @return User
*/
- public function setActive(bool $active) {
+ public function setActive(bool $active): User {
$this->active = $active;
return $this;
@@ -228,7 +237,7 @@ class User implements UserInterface, \Serializable {
*
* @return User
*/
- public function setDisabled(bool $disabled) {
+ public function setDisabled(bool $disabled): User {
$this->disabled = $disabled;
return $this;
@@ -250,7 +259,7 @@ class User implements UserInterface, \Serializable {
*
* @return User
*/
- public function setCreated(\DateTime $created) {
+ public function setCreated(\DateTime $created): User {
$this->created = $created;
return $this;
@@ -272,7 +281,7 @@ class User implements UserInterface, \Serializable {
*
* @return User
*/
- public function setUpdated(\DateTime $updated) {
+ public function setUpdated(\DateTime $updated): User {
$this->updated = $updated;
return $this;
@@ -290,7 +299,7 @@ class User implements UserInterface, \Serializable {
/**
* Set civility
*/
- public function setCivility(Civility $civility) {
+ public function setCivility(Civility $civility): User {
$this->civility = $civility;
return $this;
@@ -306,7 +315,7 @@ class User implements UserInterface, \Serializable {
/**
* Add group
*
- * @param \Rapsys\UserBundle\Entity\Group $group
+ * @param Group $group
*
* @return User
*/
@@ -319,7 +328,7 @@ class User implements UserInterface, \Serializable {
/**
* Remove group
*
- * @param \Rapsys\UserBundle\Entity\Group $group
+ * @param Group $group
*/
public function removeGroup(Group $group) {
$this->groups->removeElement($group);
@@ -328,7 +337,7 @@ class User implements UserInterface, \Serializable {
/**
* Get groups
*
- * @return \Doctrine\Common\Collections\ArrayCollection
+ * @return ArrayCollection
*/
public function getGroups(): ArrayCollection {
return $this->groups;
@@ -401,10 +410,15 @@ class User implements UserInterface, \Serializable {
*/
public function eraseCredentials(): void {}
+ /**
+ * {@inheritdoc}
+ */
public function serialize(): string {
return serialize([
$this->id,
$this->mail,
+ $this->forename,
+ $this->surname,
$this->password,
$this->active,
$this->disabled,
@@ -413,10 +427,15 @@ class User implements UserInterface, \Serializable {
]);
}
+ /**
+ * {@inheritdoc}
+ */
public function unserialize($serialized) {
list(
$this->id,
$this->mail,
+ $this->forename,
+ $this->surname,
$this->password,
$this->active,
$this->disabled,
@@ -428,7 +447,8 @@ class User implements UserInterface, \Serializable {
/**
* Check if account is activated
*
- * @xxx was from deprecated AdvancedUserInterface, see if it's used anymore
+ * It was from deprecated AdvancedUserInterface, see if it's used anymore
+ *
* @see vendor/symfony/security-core/User/AdvancedUserInterface.php
*/
public function isActivated(): bool {
@@ -438,7 +458,8 @@ class User implements UserInterface, \Serializable {
/**
* Check if account is disabled
*
- * @xxx was from deprecated AdvancedUserInterface, see if it's used anymore
+ * It was from deprecated AdvancedUserInterface, see if it's used anymore
+ *
* @see vendor/symfony/security-core/User/AdvancedUserInterface.php
*/
public function isDisabled(): bool {
@@ -448,7 +469,7 @@ class User implements UserInterface, \Serializable {
/**
* {@inheritdoc}
*/
- public function preUpdate(\Doctrine\ORM\Event\PreUpdateEventArgs $eventArgs) {
+ public function preUpdate(PreUpdateEventArgs $eventArgs) {
//Check that we have an user instance
if (($user = $eventArgs->getEntity()) instanceof User) {
//Set updated value
@@ -456,6 +477,22 @@ class User implements UserInterface, \Serializable {
}
}
+ /**
+ * Returns a recipient name of the user
+ *
+ * @return string
+ */
+ public function getRecipientName(): string {
+ //Without forename and surname
+ if (empty($this->forename) && empty($this->surname)) {
+ //Return recipient name from mail
+ return ucwords(trim(preg_replace('/[^a-zA-Z]+/', ' ', current(explode('@', $this->mail)))));
+ }
+
+ //Return recipient name from forename and surname
+ return implode(' ', [$this->forename, $this->surname]);
+ }
+
/**
* Returns a string representation of the user
*