This commit is contained in:
Jeremy Benoist
2015-05-30 13:52:26 +02:00
parent 399bd777d7
commit 4346a86068
31 changed files with 204 additions and 163 deletions

View File

@ -6,7 +6,7 @@ use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/**
* Config
* Config.
*
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ConfigRepository")
* @ORM\Table
@ -15,7 +15,7 @@ use Symfony\Component\Validator\Constraints as Assert;
class Config
{
/**
* @var integer
* @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
@ -32,7 +32,7 @@ class Config
private $theme;
/**
* @var integer
* @var int
*
* @Assert\NotBlank()
* @Assert\Range(
@ -60,7 +60,7 @@ class Config
private $rssToken;
/**
* @var integer
* @var int
*
* @ORM\Column(name="rss_limit", type="integer", nullable=true)
* @Assert\Range(
@ -85,9 +85,9 @@ class Config
}
/**
* Get id
* Get id.
*
* @return integer
* @return int
*/
public function getId()
{
@ -95,9 +95,10 @@ class Config
}
/**
* Set theme
* Set theme.
*
* @param string $theme
*
* @param string $theme
* @return Config
*/
public function setTheme($theme)
@ -108,7 +109,7 @@ class Config
}
/**
* Get theme
* Get theme.
*
* @return string
*/
@ -118,9 +119,10 @@ class Config
}
/**
* Set itemsPerPage
* Set itemsPerPage.
*
* @param int $itemsPerPage
*
* @param integer $itemsPerPage
* @return Config
*/
public function setItemsPerPage($itemsPerPage)
@ -131,9 +133,9 @@ class Config
}
/**
* Get itemsPerPage
* Get itemsPerPage.
*
* @return integer
* @return int
*/
public function getItemsPerPage()
{
@ -141,9 +143,10 @@ class Config
}
/**
* Set language
* Set language.
*
* @param string $language
*
* @param string $language
* @return Config
*/
public function setLanguage($language)
@ -154,7 +157,7 @@ class Config
}
/**
* Get language
* Get language.
*
* @return string
*/
@ -164,9 +167,10 @@ class Config
}
/**
* Set user
* Set user.
*
* @param \Wallabag\CoreBundle\Entity\User $user
*
* @param \Wallabag\CoreBundle\Entity\User $user
* @return Config
*/
public function setUser(\Wallabag\CoreBundle\Entity\User $user = null)
@ -177,7 +181,7 @@ class Config
}
/**
* Get user
* Get user.
*
* @return \Wallabag\CoreBundle\Entity\User
*/
@ -187,9 +191,10 @@ class Config
}
/**
* Set rssToken
* Set rssToken.
*
* @param string $rssToken
*
* @param string $rssToken
* @return Config
*/
public function setRssToken($rssToken)
@ -200,7 +205,7 @@ class Config
}
/**
* Get rssToken
* Get rssToken.
*
* @return string
*/
@ -210,9 +215,10 @@ class Config
}
/**
* Set rssLimit
* Set rssLimit.
*
* @param string $rssLimit
*
* @param string $rssLimit
* @return Config
*/
public function setRssLimit($rssLimit)
@ -223,7 +229,7 @@ class Config
}
/**
* Get rssLimit
* Get rssLimit.
*
* @return string
*/

View File

@ -9,7 +9,7 @@ use Hateoas\Configuration\Annotation as Hateoas;
use JMS\Serializer\Annotation\XmlRoot;
/**
* Entry
* Entry.
*
* @XmlRoot("entry")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository")
@ -21,7 +21,7 @@ class Entry
{
/** @Serializer\XmlAttribute */
/**
* @var integer
* @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
@ -45,14 +45,14 @@ class Entry
private $url;
/**
* @var boolean
* @var bool
*
* @ORM\Column(name="is_archived", type="boolean")
*/
private $isArchived = false;
/**
* @var boolean
* @var bool
*
* @ORM\Column(name="is_starred", type="boolean")
*/
@ -94,7 +94,7 @@ class Entry
private $mimetype;
/**
* @var integer
* @var int
*
* @ORM\Column(name="reading_type", type="integer", nullable=true)
*/
@ -108,7 +108,7 @@ class Entry
private $domainName;
/**
* @var boolean
* @var bool
*
* @ORM\Column(name="is_public", type="boolean", nullable=true, options={"default" = false})
*/
@ -135,9 +135,9 @@ class Entry
}
/**
* Get id
* Get id.
*
* @return integer
* @return int
*/
public function getId()
{
@ -145,9 +145,10 @@ class Entry
}
/**
* Set title
* Set title.
*
* @param string $title
*
* @param string $title
* @return Entry
*/
public function setTitle($title)
@ -158,7 +159,7 @@ class Entry
}
/**
* Get title
* Get title.
*
* @return string
*/
@ -168,9 +169,10 @@ class Entry
}
/**
* Set url
* Set url.
*
* @param string $url
*
* @param string $url
* @return Entry
*/
public function setUrl($url)
@ -181,7 +183,7 @@ class Entry
}
/**
* Get url
* Get url.
*
* @return string
*/
@ -191,9 +193,10 @@ class Entry
}
/**
* Set isArchived
* Set isArchived.
*
* @param string $isArchived
*
* @param string $isArchived
* @return Entry
*/
public function setArchived($isArchived)
@ -204,7 +207,7 @@ class Entry
}
/**
* Get isArchived
* Get isArchived.
*
* @return string
*/
@ -221,9 +224,10 @@ class Entry
}
/**
* Set isStarred
* Set isStarred.
*
* @param string $isStarred
*
* @param string $isStarred
* @return Entry
*/
public function setStarred($isStarred)
@ -234,7 +238,7 @@ class Entry
}
/**
* Get isStarred
* Get isStarred.
*
* @return string
*/
@ -251,9 +255,10 @@ class Entry
}
/**
* Set content
* Set content.
*
* @param string $content
*
* @param string $content
* @return Entry
*/
public function setContent($content)
@ -264,7 +269,7 @@ class Entry
}
/**
* Get content
* Get content.
*
* @return string
*/
@ -375,7 +380,7 @@ class Entry
}
/**
* @return boolean
* @return bool
*/
public function isPublic()
{
@ -383,7 +388,7 @@ class Entry
}
/**
* @param boolean $isPublic
* @param bool $isPublic
*/
public function setPublic($isPublic)
{

View File

@ -9,7 +9,7 @@ use JMS\Serializer\Annotation\Expose;
use Doctrine\Common\Collections\ArrayCollection;
/**
* Tag
* Tag.
*
* @XmlRoot("tag")
* @ORM\Table
@ -19,7 +19,7 @@ use Doctrine\Common\Collections\ArrayCollection;
class Tag
{
/**
* @var integer
* @var int
*
* @Expose
* @ORM\Column(name="id", type="integer")
@ -52,9 +52,9 @@ class Tag
$this->entries = new ArrayCollection();
}
/**
* Get id
* Get id.
*
* @return integer
* @return int
*/
public function getId()
{
@ -62,9 +62,10 @@ class Tag
}
/**
* Set label
* Set label.
*
* @param string $label
*
* @param string $label
* @return Tag
*/
public function setLabel($label)
@ -75,7 +76,7 @@ class Tag
}
/**
* Get label
* Get label.
*
* @return string
*/

View File

@ -12,7 +12,7 @@ use JMS\Serializer\Annotation\ExclusionPolicy;
use JMS\Serializer\Annotation\Expose;
/**
* User
* User.
*
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\UserRepository")
* @ORM\Table
@ -25,7 +25,7 @@ use JMS\Serializer\Annotation\Expose;
class User implements AdvancedUserInterface, \Serializable
{
/**
* @var integer
* @var int
*
* @Expose
* @ORM\Column(name="id", type="integer")
@ -142,9 +142,9 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Get id
* Get id.
*
* @return integer
* @return int
*/
public function getId()
{
@ -152,9 +152,10 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Set username
* Set username.
*
* @param string $username
*
* @param string $username
* @return User
*/
public function setUsername($username)
@ -165,7 +166,7 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Get username
* Get username.
*
* @return string
*/
@ -191,9 +192,10 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Set password
* Set password.
*
* @param string $password
*
* @param string $password
* @return User
*/
public function setPassword($password)
@ -208,7 +210,7 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Get password
* Get password.
*
* @return string
*/
@ -218,9 +220,10 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Set name
* Set name.
*
* @param string $name
*
* @param string $name
* @return User
*/
public function setName($name)
@ -231,7 +234,7 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Get name
* Get name.
*
* @return string
*/
@ -241,9 +244,10 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Set email
* Set email.
*
* @param string $email
*
* @param string $email
* @return User
*/
public function setEmail($email)
@ -254,7 +258,7 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Get email
* Get email.
*
* @return string
*/
@ -341,8 +345,7 @@ class User implements AdvancedUserInterface, \Serializable
public function unserialize($serialized)
{
list(
$this->id,
) = unserialize($serialized);
$this->id) = unserialize($serialized);
}
public function isEqualTo(UserInterface $user)
@ -370,9 +373,10 @@ class User implements AdvancedUserInterface, \Serializable
return $this->isActive;
}
/**
* Set config
* Set config.
*
* @param \Wallabag\CoreBundle\Entity\Config $config
*
* @param \Wallabag\CoreBundle\Entity\Config $config
* @return User
*/
public function setConfig(\Wallabag\CoreBundle\Entity\Config $config = null)
@ -383,7 +387,7 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Get config
* Get config.
*
* @return \Wallabag\CoreBundle\Entity\Config
*/
@ -393,9 +397,10 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Set confirmationToken
* Set confirmationToken.
*
* @param string $confirmationToken
*
* @param string $confirmationToken
* @return User
*/
public function setConfirmationToken($confirmationToken)
@ -406,7 +411,7 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Get confirmationToken
* Get confirmationToken.
*
* @return string
*/
@ -416,9 +421,10 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Set passwordRequestedAt
* Set passwordRequestedAt.
*
* @param \DateTime $passwordRequestedAt
*
* @param \DateTime $passwordRequestedAt
* @return User
*/
public function setPasswordRequestedAt($passwordRequestedAt)
@ -429,7 +435,7 @@ class User implements AdvancedUserInterface, \Serializable
}
/**
* Get passwordRequestedAt
* Get passwordRequestedAt.
*
* @return \DateTime
*/