Remove pseudonym and slug

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index 3c1c7686100f13a69bd7a486afe0f69e52c25f25..cd32f1ec0e08623bf4b3a3922598bb13cecbb98c 100644 (file)
--- 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,35 @@ 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) {
+               //Extract names from mail
+               $names = explode(' ', ucwords(trim(preg_replace('/[^a-zA-Z]+/', ' ', current(explode('@', $mail))))));
+
+               //Set defaults
+               $this->mail = $mail;
+               $this->forename = $names[0];
+               $this->surname = $names[1]??$names[0];
+               $this->password = $mail;
                $this->active = false;
                $this->disabled = false;
+               $this->created = new \DateTime('now');
+               $this->updated = new \DateTime('now');
+
+               //Set collections
                $this->groups = new ArrayCollection();
        }
 
@@ -94,7 +116,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return User
         */
-       public function setMail(string $mail) {
+       public function setMail(string $mail): User {
                $this->mail = $mail;
 
                return $this;
@@ -105,32 +127,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 +138,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 +149,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return string
         */
-       public function getForename(): ?string {
+       public function getForename(): string {
                return $this->forename;
        }
 
@@ -160,7 +160,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 +171,7 @@ class User implements UserInterface, \Serializable {
         *
         * @return string
         */
-       public function getSurname(): ?string {
+       public function getSurname(): string {
                return $this->surname;
        }
 
@@ -182,7 +182,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 +206,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 +228,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 +250,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 +272,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 +290,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 +306,7 @@ class User implements UserInterface, \Serializable {
        /**
         * Add group
         *
-        * @param \Rapsys\UserBundle\Entity\Group $group
+        * @param Group $group
         *
         * @return User
         */
@@ -319,7 +319,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 +328,7 @@ class User implements UserInterface, \Serializable {
        /**
         * Get groups
         *
-        * @return \Doctrine\Common\Collections\ArrayCollection
+        * @return ArrayCollection
         */
        public function getGroups(): ArrayCollection {
                return $this->groups;
@@ -401,10 +401,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 +418,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,
@@ -450,7 +460,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