pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Renamed uuid to uid

Browse Source
This commit is contained in:
Nicolas Lœuillet
2016-12-29 10:09:44 +01:00
parent 89cd670abf
commit 7239082a5e
5 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Wallabag/CoreBundle/Entity/Entry.php
View File

@ -24,7 +24,7 @@ use Wallabag\AnnotationBundle\Entity\Annotation;
* options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"},
* indexes={
* @ORM\Index(name="created_at", columns={"created_at"}),
* @ORM\Index(name="uuid", columns={"uuid"})
* @ORM\Index(name="uid", columns={"uid"})
* }
* )
* @ORM\HasLifecycleCallbacks()
@ -47,11 +47,11 @@ class Entry
/**
* @var string
*
* @ORM\Column(name="uuid", type="string", length=23, nullable=true)
* @ORM\Column(name="uid", type="string", length=23, nullable=true)
*
* @Groups({"entries_for_user", "export_all"})
*/
private $uuid;
private $uid;
/**
* @var string
@ -652,34 +652,34 @@ class Entry
/**
* @return string
*/
public function getUuid()
public function getUid()
{
return $this->uuid;
return $this->uid;
}
/**
* @param string $uuid
* @param string $uid
*
* @return Entry
*/
public function setUuid($uuid)
public function setUid($uid)
{
$this->uuid = $uuid;
$this->uid = $uid;
return $this;
}
public function generateUuid()
public function generateUid()
{
if (null === $this->uuid) {
if (null === $this->uid) {
// @see http://blog.kevingomez.fr/til/2015/07/26/why-is-uniqid-slow/ for true parameter
$this->uuid = uniqid('', true);
$this->uid = uniqid('', true);
}
}
public function cleanUuid()
public function cleanUid()
{
$this->uuid = null;
$this->uid = null;
}
/**