-<?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 Rapsys\UserBundle\Entity\Title;
+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
*/
protected $active;
+ /**
+ * @var bool
+ */
+ protected $disabled;
+
/**
* @var \DateTime
*/
protected $updated;
/**
- * @var \Rapsys\UserBundle\Entity\Title
+ * @var Civility
*/
- protected $title;
+ protected $civility;
/**
- * @var \Doctrine\Common\Collections\Collection
+ * @var ArrayCollection
*/
protected $groups;
/**
* Constructor
+ *
+ * @param string $mail The user mail
*/
- public function __construct() {
+ public function __construct(string $mail) {
+ $this->mail = $mail;
$this->active = false;
+ $this->disabled = false;
$this->groups = new ArrayCollection();
}
*
* @return integer
*/
- public function getId() {
+ public function getId(): int {
return $this->id;
}
*
* @return User
*/
- public function setMail($mail) {
+ public function setMail(string $mail): User {
$this->mail = $mail;
return $this;
*
* @return string
*/
- public function getMail() {
+ public function getMail(): ?string {
return $this->mail;
}
*
* @return User
*/
- public function setPseudonym($pseudonym) {
+ public function setPseudonym(string $pseudonym): User {
$this->pseudonym = $pseudonym;
return $this;
*
* @return string
*/
- public function getPseudonym() {
+ public function getPseudonym(): ?string {
return $this->pseudonym;
}
*
* @return User
*/
- public function setForename($forename) {
+ public function setForename(string $forename): User {
$this->forename = $forename;
return $this;
*
* @return string
*/
- public function getForename() {
+ public function getForename(): ?string {
return $this->forename;
}
*
* @return User
*/
- public function setSurname($surname) {
+ public function setSurname(string $surname): User {
$this->surname = $surname;
return $this;
*
* @return string
*/
- public function getSurname() {
+ public function getSurname(): ?string {
return $this->surname;
}
*
* @return User
*/
- public function setPassword($password) {
+ public function setPassword(string $password): User {
$this->password = $password;
return $this;
*
* @return string
*/
- public function getPassword() {
+ public function getPassword(): ?string {
return $this->password;
}
*
* @return User
*/
- public function setActive($active) {
+ public function setActive(bool $active): User {
$this->active = $active;
return $this;
*
* @return bool
*/
- public function getActive() {
+ public function getActive(): bool {
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
*
*
* @return User
*/
- public function setCreated($created) {
+ public function setCreated(\DateTime $created): User {
$this->created = $created;
return $this;
*
* @return \DateTime
*/
- public function getCreated() {
+ public function getCreated(): \DateTime {
return $this->created;
}
*
* @return User
*/
- public function setUpdated($updated) {
+ public function setUpdated(\DateTime $updated): User {
$this->updated = $updated;
return $this;
*
* @return \DateTime
*/
- public function getUpdated() {
+ public function getUpdated(): \DateTime {
return $this->updated;
}
/**
- * Set title
+ * Set civility
*/
- public function setTitle(Title $title) {
- $this->title = $title;
+ public function setCivility(Civility $civility): User {
+ $this->civility = $civility;
return $this;
}
/**
- * Get title
+ * Get civility
*/
- public function getTitle(): Title {
- return $this->title;
+ public function getCivility(): ?Civility {
+ return $this->civility;
}
/**
* Add group
*
- * @param \Rapsys\UserBundle\Entity\Group $group
+ * @param Group $group
*
* @return User
*/
/**
* Remove group
*
- * @param \Rapsys\UserBundle\Entity\Group $group
+ * @param Group $group
*/
public function removeGroup(Group $group) {
$this->groups->removeElement($group);
/**
* Get groups
*
- * @return \Doctrine\Common\Collections\Collection
+ * @return ArrayCollection
*/
- public function getGroups() {
+ public function getGroups(): ArrayCollection {
return $this->groups;
}
/**
* {@inheritdoc}
*/
- public function getRoles() {
+ public function getRoles(): array {
//Get the unique roles list by id
return array_unique(array_reduce(
//Cast groups as array
$array[$group->getId()] = $group->getRole();
return $array;
},
- //Init with ROLE_USER
- //XXX: we assume that ROLE_USER has id 1 in database
- [ 1 => 'ROLE_USER' ]
+ //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 getRole() {
+ /**
+ * {@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 ($id > $cur) {
+ if ($cur === null || $id > $cur) {
return $id;
}
return $cur;
},
- 0
+ null
)];
}
/**
* {@inheritdoc}
*/
- public function getSalt() {
+ public function getSalt(): ?string {
//No salt required with bcrypt
return null;
}
/**
* {@inheritdoc}
*/
- public function getUsername() {
+ public function getUsername(): string {
return $this->mail;
}
/**
* {@inheritdoc}
*/
- public function eraseCredentials() {}
+ public function eraseCredentials(): void {}
public function serialize(): string {
return serialize([
$this->mail,
$this->password,
$this->active,
+ $this->disabled,
$this->created,
$this->updated
]);
$this->mail,
$this->password,
$this->active,
+ $this->disabled,
$this->created,
$this->updated
) = unserialize($serialized);
}
- //XXX: was from vendor/symfony/security-core/User/AdvancedUserInterface.php, see if it's used anymore
- public function isEnabled() {
+ /**
+ * 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;
}
+ /**
+ * 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;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function preUpdate(\Doctrine\ORM\Event\PreUpdateEventArgs $eventArgs) {
+ //Check that we have an user instance
+ if (($user = $eventArgs->getEntity()) instanceof User) {
+ //Set updated value
+ $user->setUpdated(new \DateTime('now'));
+ }
+ }
+
/**
* Returns a string representation of the user
*
* @return string
*/
public function __toString(): string {
- return $this->title.' '.$this->forename.' '.$this->surname;
+ return $this->civility.' '.$this->forename.' '.$this->surname;
}
}
Rapsys Git / userbundle / blobdiff