oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Updating logged in user (email, name, etc ..)

Browse source
This commit is contained in:
Jeremy 2015-02-17 22:45:20 +01:00
parent d9085c63e3
commit c0d9eba07f
7 changed files with 185 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Wallabag/CoreBundle/Entity/User.php
View file

@ -6,6 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Core\User\AdvancedUserInterface;
use Symfony\Component\Validator\Constraints as Assert;
/**
* User
@ -29,6 +30,11 @@ class User implements AdvancedUserInterface, \Serializable
* @var string
*
* @ORM\Column(name="username", type="text")
* @Assert\NotBlank()
* @Assert\Length(
* min = "3",
* max = "255"
* )
*/
private $username;
@ -56,14 +62,16 @@ class User implements AdvancedUserInterface, \Serializable
/**
* @var string
*
* @ORM\Column(name="email", type="text", nullable=true)
* @ORM\Column(name="email", type="text", nullable=false)
* @Assert\Email()
* @Assert\NotBlank()
*/
private $email;
/**
* @ORM\Column(name="is_active", type="boolean")
* @ORM\Column(name="is_active", type="boolean", nullable=false)
*/
private $isActive;
private $isActive = true;
/**
* @var date
@ -86,9 +94,8 @@ class User implements AdvancedUserInterface, \Serializable
public function __construct()
{
$this->isActive = true;
$this->salt = md5(uniqid(null, true));
$this->entries = new ArrayCollection();
$this->salt = md5(uniqid(null, true));
$this->entries = new ArrayCollection();
}
/**