Rapsys Git
/
userbundle
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add alias
[userbundle]
/
Entity
/
User.php
diff --git
a/Entity/User.php
b/Entity/User.php
index 4eee930541e5f2c6bf29ca2e9e5891b2cea0d5b3..5220e77dd0bec6410bc184ef0dd487e1ac433e46 100644
(file)
--- a/
Entity/User.php
+++ b/
Entity/User.php
@@
-14,68
+14,34
@@
namespace Rapsys\UserBundle\Entity;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Event\PreUpdateEventArgs;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Event\PreUpdateEventArgs;
-use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
use Rapsys\UserBundle\Entity\Civility;
use Rapsys\UserBundle\Entity\Group;
use Rapsys\UserBundle\Entity\Civility;
use Rapsys\UserBundle\Entity\Group;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
+
/**
* User
*/
class User implements UserInterface, PasswordAuthenticatedUserInterface {
/**
/**
* User
*/
class User implements UserInterface, PasswordAuthenticatedUserInterface {
/**
- * @var ?integer
- */
- protected ?int $id;
-
- /**
- * @var string
- */
- protected string $mail;
-
- /**
- * @var string
- */
- protected string $password;
-
- /**
- * @var ?string
- */
- protected ?string $forename;
-
- /**
- * @var ?string
- */
- protected ?string $surname;
-
- /**
- * @var bool
+ * Primary key
*/
*/
- protected
bool $active
;
+ protected
?int $id = null
;
/**
/**
- * @var bool
- */
- protected bool $disabled;
-
- /**
- * @var \DateTime
+ * Create datetime
*/
protected \DateTime $created;
/**
*/
protected \DateTime $created;
/**
- *
@var \DateT
ime
+ *
Update datet
ime
*/
protected \DateTime $updated;
/**
*/
protected \DateTime $updated;
/**
- * @var Civility
- */
- protected ?Civility $civility;
-
- /**
- * @var Doctrine\Common\Collections\Collection
+ * Groups collection
*/
protected Collection $groups;
*/
protected Collection $groups;
@@
-88,17
+54,10
@@
class User implements UserInterface, PasswordAuthenticatedUserInterface {
* @param ?string $forename The user forename
* @param ?string $surname The user surname
* @param bool $active The user active
* @param ?string $forename The user forename
* @param ?string $surname The user surname
* @param bool $active The user active
- * @param bool $
disabled The user disabled
+ * @param bool $
enable The user enable
*/
*/
- public function __construct(
string $mail, string $password, ?Civility $civility = null, ?string $forename = null, ?string $surname = null, bool $active = false, bool $disabled = fals
e) {
+ public function __construct(
protected string $mail, protected string $password, protected ?Civility $civility = null, protected ?string $forename = null, protected ?string $surname = null, protected bool $active = false, protected bool $enable = tru
e) {
//Set defaults
//Set defaults
- $this->mail = $mail;
- $this->password = $password;
- $this->civility = $civility;
- $this->forename = $forename;
- $this->surname = $surname;
- $this->active = $active;
- $this->disabled = $disabled;
$this->created = new \DateTime('now');
$this->updated = new \DateTime('now');
$this->created = new \DateTime('now');
$this->updated = new \DateTime('now');
@@
-196,10
+155,10
@@
class User implements UserInterface, PasswordAuthenticatedUserInterface {
}
/**
}
/**
- * Get password
- *
* {@inheritdoc}
*
* {@inheritdoc}
*
+ * Get password
+ *
* @return string
*/
public function getPassword(): string {
* @return string
*/
public function getPassword(): string {
@@
-229,25
+188,25
@@
class User implements UserInterface, PasswordAuthenticatedUserInterface {
}
/**
}
/**
- * Set
disabled
+ * Set
enable
*
*
- * @param bool $
disabled
+ * @param bool $
enable
*
* @return User
*/
*
* @return User
*/
- public function set
Disabled(bool $disabled
): User {
- $this->
disabled = $disabled
;
+ public function set
Enable(bool $enable
): User {
+ $this->
enable = $enable
;
return $this;
}
/**
return $this;
}
/**
- * Get
disabled
+ * Get
enable
*
* @return bool
*/
*
* @return bool
*/
- public function get
Disabled
(): bool {
- return $this->
disabled
;
+ public function get
Enable
(): bool {
+ return $this->
enable
;
}
/**
}
/**
@@
-357,7
+316,7
@@
class User implements UserInterface, PasswordAuthenticatedUserInterface {
return $array;
},
//Init with empty array
return $array;
},
//Init with empty array
- //XXX: on registration, add each group present in rapsys
_
user.default.group array to user
+ //XXX: on registration, add each group present in rapsysuser.default.group array to user
//XXX: see vendor/rapsys/userbundle/Controller/DefaultController.php +450
[]
));
//XXX: see vendor/rapsys/userbundle/Controller/DefaultController.php +450
[]
));
@@
-428,7
+387,7
@@
class User implements UserInterface, PasswordAuthenticatedUserInterface {
$this->surname,
$this->password,
$this->active,
$this->surname,
$this->password,
$this->active,
- $this->
disabled
,
+ $this->
enable
,
$this->created,
$this->updated
];
$this->created,
$this->updated
];
@@
-445,7
+404,7
@@
class User implements UserInterface, PasswordAuthenticatedUserInterface {
$this->surname,
$this->password,
$this->active,
$this->surname,
$this->password,
$this->active,
- $this->
disabled
,
+ $this->
enable
,
$this->created,
$this->updated
) = $data;
$this->created,
$this->updated
) = $data;
@@
-454,23
+413,19
@@
class User implements UserInterface, PasswordAuthenticatedUserInterface {
/**
* Check if account is activated
*
/**
* Check if account is activated
*
- * It was from deprecated AdvancedUserInterface, see if it's used anymore
- *
- * @see vendor/symfony/security-core/User/AdvancedUserInterface.php
+ * @see vendor/rapsys/userbundle/Checker/UserChecker.php
*/
public function isActivated(): bool {
return $this->active;
}
/**
*/
public function isActivated(): bool {
return $this->active;
}
/**
- * Check if account is disabled
- *
- * It was from deprecated AdvancedUserInterface, see if it's used anymore
+ * Check if account is enabled
*
*
- * @see vendor/symfony/security-core/User/
AdvancedUserInterface
.php
+ * @see vendor/symfony/security-core/User/
InMemoryUserChecker
.php
*/
*/
- public function is
Dis
abled(): bool {
- return $this->
disabled
;
+ public function is
En
abled(): bool {
+ return $this->
enable
;
}
/**
}
/**
@@
-478,7
+433,7
@@
class User implements UserInterface, PasswordAuthenticatedUserInterface {
*/
public function preUpdate(PreUpdateEventArgs $eventArgs) {
//Check that we have an user instance
*/
public function preUpdate(PreUpdateEventArgs $eventArgs) {
//Check that we have an user instance
- if (($user = $eventArgs->get
Entity
()) instanceof User) {
+ if (($user = $eventArgs->get
Object
()) instanceof User) {
//Set updated value
$user->setUpdated(new \DateTime('now'));
}
//Set updated value
$user->setUpdated(new \DateTime('now'));
}