From 653e8be4c1ae589fff52af0229338ced7b2ada2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 6 Feb 2015 18:15:19 +0100
Subject: rename Tags entity

why did I delete this file?

rename Tags entity

rename Tags entity
---
 src/Wallabag/CoreBundle/Entity/Tag.php         | 63 +++++++++++++++++
 src/Wallabag/CoreBundle/Entity/Tags.php        | 63 -----------------
 src/Wallabag/CoreBundle/Entity/TagsEntries.php | 93 --------------------------
 3 files changed, 63 insertions(+), 156 deletions(-)
 create mode 100644 src/Wallabag/CoreBundle/Entity/Tag.php
 delete mode 100644 src/Wallabag/CoreBundle/Entity/Tags.php
 delete mode 100644 src/Wallabag/CoreBundle/Entity/TagsEntries.php

(limited to 'src/Wallabag/CoreBundle/Entity')

diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php
new file mode 100644
index 00000000..31017563
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Entity/Tag.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Wallabag\CoreBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Tag
+ *
+ * @ORM\Table(name="tag")
+ * @ORM\Entity
+ */
+class Tag
+{
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="label", type="text")
+     */
+    private $label;
+
+    /**
+     * Get id
+     *
+     * @return integer
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set label
+     *
+     * @param  string $label
+     * @return Tag
+     */
+    public function setLabel($label)
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    /**
+     * Get label
+     *
+     * @return string
+     */
+    public function getLabel()
+    {
+        return $this->value;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Entity/Tags.php b/src/Wallabag/CoreBundle/Entity/Tags.php
deleted file mode 100644
index eab91ba0..00000000
--- a/src/Wallabag/CoreBundle/Entity/Tags.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * Tags
- *
- * @ORM\Table(name="tags")
- * @ORM\Entity
- */
-class Tags
-{
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer", nullable=false)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="value", type="text", nullable=true)
-     */
-    private $value;
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set value
-     *
-     * @param  string $value
-     * @return Tags
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-
-        return $this;
-    }
-
-    /**
-     * Get value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Entity/TagsEntries.php b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
deleted file mode 100644
index 6b0cea0d..00000000
--- a/src/Wallabag/CoreBundle/Entity/TagsEntries.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * TagsEntries
- *
- * @ORM\Table(name="tags_entries")
- * @ORM\Entity
- */
-class TagsEntries
-{
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer", nullable=false)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="entry_id", type="integer", nullable=true)
-     */
-    private $entryId;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="tag_id", type="integer", nullable=true)
-     */
-    private $tagId;
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set entryId
-     *
-     * @param  integer     $entryId
-     * @return TagsEntries
-     */
-    public function setEntryId($entryId)
-    {
-        $this->entryId = $entryId;
-
-        return $this;
-    }
-
-    /**
-     * Get entryId
-     *
-     * @return integer
-     */
-    public function getEntryId()
-    {
-        return $this->entryId;
-    }
-
-    /**
-     * Set tagId
-     *
-     * @param  integer     $tagId
-     * @return TagsEntries
-     */
-    public function setTagId($tagId)
-    {
-        $this->tagId = $tagId;
-
-        return $this;
-    }
-
-    /**
-     * Get tagId
-     *
-     * @return integer
-     */
-    public function getTagId()
-    {
-        return $this->tagId;
-    }
-}
-- 
cgit v1.2.3


From 970c40bb939b0c2bfe8a4b6ac3937eb344bbcc4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 9 Feb 2015 15:07:48 +0100
Subject: restore TagsEntries

---
 src/Wallabag/CoreBundle/Entity/TagsEntries.php | 93 ++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 src/Wallabag/CoreBundle/Entity/TagsEntries.php

(limited to 'src/Wallabag/CoreBundle/Entity')

diff --git a/src/Wallabag/CoreBundle/Entity/TagsEntries.php b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
new file mode 100644
index 00000000..6b0cea0d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Wallabag\CoreBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * TagsEntries
+ *
+ * @ORM\Table(name="tags_entries")
+ * @ORM\Entity
+ */
+class TagsEntries
+{
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer", nullable=false)
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="IDENTITY")
+     */
+    private $id;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="entry_id", type="integer", nullable=true)
+     */
+    private $entryId;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="tag_id", type="integer", nullable=true)
+     */
+    private $tagId;
+
+    /**
+     * Get id
+     *
+     * @return integer
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set entryId
+     *
+     * @param  integer     $entryId
+     * @return TagsEntries
+     */
+    public function setEntryId($entryId)
+    {
+        $this->entryId = $entryId;
+
+        return $this;
+    }
+
+    /**
+     * Get entryId
+     *
+     * @return integer
+     */
+    public function getEntryId()
+    {
+        return $this->entryId;
+    }
+
+    /**
+     * Set tagId
+     *
+     * @param  integer     $tagId
+     * @return TagsEntries
+     */
+    public function setTagId($tagId)
+    {
+        $this->tagId = $tagId;
+
+        return $this;
+    }
+
+    /**
+     * Get tagId
+     *
+     * @return integer
+     */
+    public function getTagId()
+    {
+        return $this->tagId;
+    }
+}
-- 
cgit v1.2.3


From fb8389f4632a0350cf33653f90be49a1c5af2c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 9 Feb 2015 15:41:07 +0100
Subject: change settings for TagsEntries model

---
 src/Wallabag/CoreBundle/Entity/TagsEntries.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Entity')

diff --git a/src/Wallabag/CoreBundle/Entity/TagsEntries.php b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
index 6b0cea0d..22826387 100644
--- a/src/Wallabag/CoreBundle/Entity/TagsEntries.php
+++ b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
@@ -15,23 +15,23 @@ class TagsEntries
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
      * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="entry_id", type="integer", nullable=true)
+     * @ORM\Column(name="entry_id", type="integer")
      */
     private $entryId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="tag_id", type="integer", nullable=true)
+     * @ORM\Column(name="tag_id", type="integer")
      */
     private $tagId;
 
-- 
cgit v1.2.3