mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-24 00:20:28 +00:00
rename User entity
This commit is contained in:
parent
29c4517f7a
commit
2f69eb4afa
3 changed files with 60 additions and 14 deletions
|
@ -5,7 +5,7 @@ namespace Wallabag\CoreBundle\Command;
|
||||||
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
|
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
use Wallabag\CoreBundle\Entity\Users;
|
use Wallabag\CoreBundle\Entity\User;
|
||||||
use Wallabag\CoreBundle\Entity\UsersConfig;
|
use Wallabag\CoreBundle\Entity\UsersConfig;
|
||||||
|
|
||||||
class InstallCommand extends ContainerAwareCommand
|
class InstallCommand extends ContainerAwareCommand
|
||||||
|
@ -128,7 +128,7 @@ class InstallCommand extends ContainerAwareCommand
|
||||||
$dialog = $this->getHelperSet()->get('dialog');
|
$dialog = $this->getHelperSet()->get('dialog');
|
||||||
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
|
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
|
||||||
|
|
||||||
$user = new Users();
|
$user = new User();
|
||||||
$user->setUsername($dialog->ask($output, '<question>Username</question> <comment>(default: wallabag)</comment> :', 'wallabag'));
|
$user->setUsername($dialog->ask($output, '<question>Username</question> <comment>(default: wallabag)</comment> :', 'wallabag'));
|
||||||
$user->setPassword($dialog->ask($output, '<question>Password</question> <comment>(default: wallabag)</comment> :', 'wallabag'));
|
$user->setPassword($dialog->ask($output, '<question>Password</question> <comment>(default: wallabag)</comment> :', 'wallabag'));
|
||||||
$user->setEmail($dialog->ask($output, '<question>Email:</question>', ''));
|
$user->setEmail($dialog->ask($output, '<question>Email:</question>', ''));
|
||||||
|
|
|
@ -302,7 +302,7 @@ class Entry
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return mixed
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getCreatedAt()
|
public function getCreatedAt()
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,30 +7,33 @@ use Symfony\Component\Security\Core\User\UserInterface;
|
||||||
use Symfony\Component\Security\Core\User\AdvancedUserInterface;
|
use Symfony\Component\Security\Core\User\AdvancedUserInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Users
|
* User
|
||||||
*
|
*
|
||||||
* @ORM\Table(name="users")
|
* @ORM\Table(name="user")
|
||||||
* @ORM\Entity
|
* @ORM\Entity
|
||||||
|
* @ORM\HasLifecycleCallbacks()
|
||||||
*/
|
*/
|
||||||
class Users implements AdvancedUserInterface, \Serializable
|
class User implements AdvancedUserInterface, \Serializable
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var integer
|
* @var integer
|
||||||
*
|
*
|
||||||
* @ORM\Column(name="id", type="integer", nullable=true)
|
* @ORM\Column(name="id", type="integer")
|
||||||
* @ORM\Id
|
* @ORM\Id
|
||||||
* @ORM\GeneratedValue(strategy="IDENTITY")
|
* @ORM\GeneratedValue(strategy="AUTO")
|
||||||
*/
|
*/
|
||||||
private $id;
|
private $id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
*
|
*
|
||||||
* @ORM\Column(name="username", type="text", nullable=true)
|
* @ORM\Column(name="username", type="text")
|
||||||
*/
|
*/
|
||||||
private $username;
|
private $username;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @var string
|
||||||
|
*
|
||||||
* @ORM\Column(type="string", length=32)
|
* @ORM\Column(type="string", length=32)
|
||||||
*/
|
*/
|
||||||
private $salt;
|
private $salt;
|
||||||
|
@ -38,7 +41,7 @@ class Users implements AdvancedUserInterface, \Serializable
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
*
|
*
|
||||||
* @ORM\Column(name="password", type="text", nullable=true)
|
* @ORM\Column(name="password", type="text")
|
||||||
*/
|
*/
|
||||||
private $password;
|
private $password;
|
||||||
|
|
||||||
|
@ -61,12 +64,39 @@ class Users implements AdvancedUserInterface, \Serializable
|
||||||
*/
|
*/
|
||||||
private $isActive;
|
private $isActive;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var date
|
||||||
|
*
|
||||||
|
* @ORM\Column(name="created_at", type="datetime")
|
||||||
|
*/
|
||||||
|
private $createdAt;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var date
|
||||||
|
*
|
||||||
|
* @ORM\Column(name="updated_at", type="datetime")
|
||||||
|
*/
|
||||||
|
private $updatedAt;
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$this->isActive = true;
|
$this->isActive = true;
|
||||||
$this->salt = md5(uniqid(null, true));
|
$this->salt = md5(uniqid(null, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @ORM\PrePersist
|
||||||
|
* @ORM\PreUpdate
|
||||||
|
*/
|
||||||
|
public function timestamps()
|
||||||
|
{
|
||||||
|
if (is_null($this->createdAt)) {
|
||||||
|
$this->createdAt = new \DateTime();
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->updatedAt = new \DateTime();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get id
|
* Get id
|
||||||
*
|
*
|
||||||
|
@ -81,7 +111,7 @@ class Users implements AdvancedUserInterface, \Serializable
|
||||||
* Set username
|
* Set username
|
||||||
*
|
*
|
||||||
* @param string $username
|
* @param string $username
|
||||||
* @return Users
|
* @return User
|
||||||
*/
|
*/
|
||||||
public function setUsername($username)
|
public function setUsername($username)
|
||||||
{
|
{
|
||||||
|
@ -120,7 +150,7 @@ class Users implements AdvancedUserInterface, \Serializable
|
||||||
* Set password
|
* Set password
|
||||||
*
|
*
|
||||||
* @param string $password
|
* @param string $password
|
||||||
* @return Users
|
* @return User
|
||||||
*/
|
*/
|
||||||
public function setPassword($password)
|
public function setPassword($password)
|
||||||
{
|
{
|
||||||
|
@ -143,7 +173,7 @@ class Users implements AdvancedUserInterface, \Serializable
|
||||||
* Set name
|
* Set name
|
||||||
*
|
*
|
||||||
* @param string $name
|
* @param string $name
|
||||||
* @return Users
|
* @return User
|
||||||
*/
|
*/
|
||||||
public function setName($name)
|
public function setName($name)
|
||||||
{
|
{
|
||||||
|
@ -166,7 +196,7 @@ class Users implements AdvancedUserInterface, \Serializable
|
||||||
* Set email
|
* Set email
|
||||||
*
|
*
|
||||||
* @param string $email
|
* @param string $email
|
||||||
* @return Users
|
* @return User
|
||||||
*/
|
*/
|
||||||
public function setEmail($email)
|
public function setEmail($email)
|
||||||
{
|
{
|
||||||
|
@ -185,6 +215,22 @@ class Users implements AdvancedUserInterface, \Serializable
|
||||||
return $this->email;
|
return $this->email;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getCreatedAt()
|
||||||
|
{
|
||||||
|
return $this->createdAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getUpdatedAt()
|
||||||
|
{
|
||||||
|
return $this->updatedAt;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
Loading…
Reference in a new issue