Merge remote-tracking branch 'origin/master' into 2.1

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / DataFixtures / ORM / LoadTagData.php

diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
index 4d9846b61e14d750d5edb7da9e129722a6e072fa..09e99f36bb46b222544d6cfe11484e270231ccac 100644 (file)
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
@@ -6,12 +6,11 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\TagsEntries;
 
 class LoadTagData extends AbstractFixture implements OrderedFixtureInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function load(ObjectManager $manager)
     {
@@ -20,42 +19,30 @@ class LoadTagData extends AbstractFixture implements OrderedFixtureInterface
 
         $manager->persist($tag1);
 
-        $this->addReference('tag1', $tag1);
-
-        $tagsEntries1 = new TagsEntries();
-        $tagsEntries1->setEntryId($this->getReference('entry1'));
-        $manager->persist($tagsEntries1);
+        $this->addReference('foo-tag', $tag1);
 
         $tag2 = new Tag();
         $tag2->setLabel('bar');
 
         $manager->persist($tag2);
 
-        $this->addReference('tag2', $tag2);
-
-        $tagsEntries2 = new TagsEntries();
-        $tagsEntries2->setEntryId($this->getReference('entry2'));
-        $manager->persist($tagsEntries2);
+        $this->addReference('bar-tag', $tag2);
 
         $tag3 = new Tag();
         $tag3->setLabel('baz');
 
         $manager->persist($tag3);
 
-        $this->addReference('tag3', $tag3);
-
-        $tagsEntries3 = new TagsEntries();
-        $tagsEntries3->setEntryId($this->getReference('entry2'));
-        $manager->persist($tagsEntries3);
+        $this->addReference('baz-tag', $tag3);
 
         $manager->flush();
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getOrder()
     {
-        return 30;
+        return 25;
     }
 }