Remove pseudonym and slug

[userbundle] / Entity / User.php

diff --git a/Entity/User.php b/Entity/User.php
index c6a6cdf542e0e1b92fa3455be9e9886a8cf34e97..cd32f1ec0e08623bf4b3a3922598bb13cecbb98c 100644 (file)
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -1,9 +1,27 @@
-<?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;
 
 namespace Rapsys\UserBundle\Entity;
 

-class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterface, \Serializable {
+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
         */
        /**
         * @var integer
         */


@@ -14,11 +32,6 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         */
        protected $mail;
 
         */
        protected $mail;
 

-       /**
-        * @var string
-        */
-       protected $pseudonym;
-

        /**
         * @var string
         */
        /**
         * @var string
         */


@@ -39,6 +52,11 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         */
        protected $active;
 
         */
        protected $active;
 

+       /**
+        * @var bool
+        */
+       protected $disabled;
+

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


@@ -50,21 +68,36 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
        protected $updated;
 
        /**
        protected $updated;
 
        /**

-        * @var \Rapsys\UserBundle\Entity\Title
+        * @var Civility

         */
         */

-       protected $title;
+       protected $civility;

 
        /**
 
        /**

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

         */
        protected $groups;
 
        /**
         */
        protected $groups;
 
        /**

-        * User constructor.
+        * 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->active = false;

-               $this->groups = new \Doctrine\Common\Collections\ArrayCollection();
+               $this->disabled = false;
+               $this->created = new \DateTime('now');
+               $this->updated = new \DateTime('now');
+
+               //Set collections
+               $this->groups = new ArrayCollection();

        }
 
        /**
        }
 
        /**


@@ -72,7 +105,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return integer
         */
         *
         * @return integer
         */

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

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


@@ -83,7 +116,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return User
         */
         *
         * @return User
         */

-       public function setMail($mail) {
+       public function setMail(string $mail): User {

                $this->mail = $mail;
 
                return $this;
                $this->mail = $mail;
 
                return $this;


@@ -94,32 +127,10 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return string
         */
         *
         * @return string
         */

-       public function getMail() {
+       public function getMail(): string {

                return $this->mail;
        }
 
                return $this->mail;
        }
 

-       /**
-        * Set pseudonym
-        *
-        * @param string $pseudonym
-        *
-        * @return User
-        */
-       public function setPseudonym($pseudonym) {
-               $this->pseudonym = $pseudonym;
-
-               return $this;
-       }
-
-       /**
-        * Get pseudonym
-        *
-        * @return string
-        */
-       public function getPseudonym() {
-               return $this->pseudonym;
-       }
-

        /**
         * Set forename
         *
        /**
         * Set forename
         *


@@ -127,7 +138,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return User
         */
         *
         * @return User
         */

-       public function setForename($forename) {
+       public function setForename(string $forename): User {

                $this->forename = $forename;
 
                return $this;
                $this->forename = $forename;
 
                return $this;


@@ -138,7 +149,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return string
         */
         *
         * @return string
         */

-       public function getForename() {
+       public function getForename(): string {

                return $this->forename;
        }
 
                return $this->forename;
        }
 


@@ -149,7 +160,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return User
         */
         *
         * @return User
         */

-       public function setSurname($surname) {
+       public function setSurname(string $surname): User {

                $this->surname = $surname;
 
                return $this;
                $this->surname = $surname;
 
                return $this;


@@ -160,7 +171,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return string
         */
         *
         * @return string
         */

-       public function getSurname() {
+       public function getSurname(): string {

                return $this->surname;
        }
 
                return $this->surname;
        }
 


@@ -171,7 +182,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return User
         */
         *
         * @return User
         */

-       public function setPassword($password) {
+       public function setPassword(string $password): User {

                $this->password = $password;
 
                return $this;
                $this->password = $password;
 
                return $this;


@@ -180,9 +191,11 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
        /**
         * Get password
         *
        /**
         * Get password
         *

+        * {@inheritdoc}
+        *

         * @return string
         */
         * @return string
         */

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

                return $this->password;
        }
 
                return $this->password;
        }
 


@@ -193,7 +206,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return User
         */
         *
         * @return User
         */

-       public function setActive($active) {
+       public function setActive(bool $active): User {

                $this->active = $active;
 
                return $this;
                $this->active = $active;
 
                return $this;


@@ -204,10 +217,32 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return bool
         */
         *
         * @return bool
         */

-       public function getActive() {
+       public function getActive(): bool {

                return $this->active;
        }
 
                return $this->active;
        }
 

+       /**
+        * Set disabled
+        *
+        * @param bool $disabled
+        *
+        * @return User
+        */
+       public function setDisabled(bool $disabled): User {
+               $this->disabled = $disabled;
+
+               return $this;
+       }
+
+       /**
+        * Get disabled
+        *
+        * @return bool
+        */
+       public function getDisabled(): bool {
+               return $this->disabled;
+       }
+

        /**
         * Set created
         *
        /**
         * Set created
         *


@@ -215,7 +250,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return User
         */
         *
         * @return User
         */

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

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


@@ -226,7 +261,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return \DateTime
         */
         *
         * @return \DateTime
         */

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

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


@@ -237,7 +272,7 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return User
         */
         *
         * @return User
         */

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

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


@@ -248,34 +283,34 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
         *
         * @return \DateTime
         */
         *
         * @return \DateTime
         */

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

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

-        * Set title
+        * Set civility

         */
         */

-       public function setTitle($title) {
-               $this->title = $title;
+       public function setCivility(Civility $civility): User {
+               $this->civility = $civility;

 
                return $this;
        }
 
        /**
 
                return $this;
        }
 
        /**

-        * Get title
+        * Get civility

         */
         */

-       public function getTitle() {
-               return $this->title;
+       public function getCivility(): ?Civility {
+               return $this->civility;

        }
 
        /**
         * Add group
         *
        }
 
        /**
         * Add group
         *

-        * @param \Rapsys\UserBundle\Entity\Group $group
+        * @param Group $group

         *
         * @return User
         */
         *
         * @return User
         */

-       public function addGroup(\Rapsys\UserBundle\Entity\Group $group) {
+       public function addGroup(Group $group) {

                $this->groups[] = $group;
 
                return $this;
                $this->groups[] = $group;
 
                return $this;


@@ -284,72 +319,161 @@ class User implements \Symfony\Component\Security\Core\User\AdvancedUserInterfac
        /**
         * Remove group
         *
        /**
         * Remove group
         *

-        * @param \Rapsys\UserBundle\Entity\Group $group
+        * @param Group $group

         */
         */

-       public function removeGroup(\Rapsys\UserBundle\Entity\Group $group) {
+       public function removeGroup(Group $group) {

                $this->groups->removeElement($group);
        }
 
        /**
         * Get groups
         *
                $this->groups->removeElement($group);
        }
 
        /**
         * Get groups
         *

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

         */
         */

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

                return $this->groups;
        }
 
                return $this->groups;
        }
 

-       public function getRoles() {
-               return $this->groups->toArray();
+       /**
+        * {@inheritdoc}
+        */
+       public function getRoles(): array {
+               //Get the unique roles list by id
+               return array_unique(array_reduce(
+                       //Cast groups as array
+                       $this->groups->toArray(),
+                       //Reduce to an array of id => group tuples
+                       function ($array, $group) {
+                               $array[$group->getId()] = $group->getRole();
+                               return $array;
+                       },
+                       //Init with empty array
+                       //XXX: on registration, add each group present in rapsys_user.default.group array to user
+                       //XXX: see vendor/rapsys/userbundle/Controller/DefaultController.php +450
+                       []
+               ));

        }
 
        }
 

-       public function getSalt() {
+       /**
+        * {@inheritdoc}
+        */
+       public function getRole(): ?string {
+               //Retrieve roles
+               $roles = $this->getRoles();
+
+               //With roles array empty
+               if ($roles === []) {
+                       //Return null
+                       return null;
+               }
+
+               //Return the role with max id
+               //XXX: should be rewriten if it change in your configuration
+               return $roles[array_reduce(
+                       array_keys($roles),
+                       function($cur, $id) {
+                               if ($cur === null || $id > $cur) {
+                                       return $id;
+                               }
+                               return $cur;
+                       },
+                       null
+               )];
+       }
+
+       /**
+        * {@inheritdoc}
+        */
+       public function getSalt(): ?string {

                //No salt required with bcrypt
                return null;
        }
 
                //No salt required with bcrypt
                return null;
        }
 

-       public function getUsername() {
+       /**
+        * {@inheritdoc}
+        */
+       public function getUsername(): string {

                return $this->mail;
        }
 
                return $this->mail;
        }
 

-       public function eraseCredentials() {
-       }
+       /**
+        * {@inheritdoc}
+        */
+       public function eraseCredentials(): void {}

 
 

-       public function serialize() {
-               return serialize(array(
+       /**
+        * {@inheritdoc}
+        */
+       public function serialize(): string {
+               return serialize([

                        $this->id,
                        $this->mail,
                        $this->id,
                        $this->mail,

+                       $this->forename,
+                       $this->surname,

                        $this->password,
                        $this->active,
                        $this->password,
                        $this->active,

+                       $this->disabled,

                        $this->created,
                        $this->updated
                        $this->created,
                        $this->updated

-               ));
+               ]);

        }
 
        }
 

+       /**
+        * {@inheritdoc}
+        */

        public function unserialize($serialized) {
                list(
                        $this->id,
                        $this->mail,
        public function unserialize($serialized) {
                list(
                        $this->id,
                        $this->mail,

+                       $this->forename,
+                       $this->surname,

                        $this->password,
                        $this->active,
                        $this->password,
                        $this->active,

+                       $this->disabled,

                        $this->created,
                        $this->updated
                ) = unserialize($serialized);
        }
 
                        $this->created,
                        $this->updated
                ) = unserialize($serialized);
        }
 

-       public function isAccountNonExpired() {
-               return true;
+       /**
+        * Check if account is activated
+        *
+        * It was from deprecated AdvancedUserInterface, see if it's used anymore
+        *
+        * @see vendor/symfony/security-core/User/AdvancedUserInterface.php
+        */
+       public function isActivated(): bool {
+               return $this->active;

        }
 
        }
 

-       public function isAccountNonLocked() {
-               return true;
+       /**
+        * Check if account is disabled
+        *
+        * It was from deprecated AdvancedUserInterface, see if it's used anymore
+        *
+        * @see vendor/symfony/security-core/User/AdvancedUserInterface.php
+        */
+       public function isDisabled(): bool {
+               return $this->disabled;

        }
 
        }
 

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

        }
 
        }
 

-       public function isEnabled() {
-               return $this->active;
+       /**
+        * Returns a string representation of the user
+        *
+        * @return string
+        */
+       public function __toString(): string {
+               return $this->civility.' '.$this->forename.' '.$this->surname;

        }
 }
        }
 }