diff options
author | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
---|---|---|
committer | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
commit | 99731f0bb1f6fd2815eeb9af504ce86df927657b (patch) | |
tree | b080efc608d2bbd52b77a4a0067402007f50c5a8 /src/Wallabag/CoreBundle/DataFixtures | |
parent | 3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff) | |
parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
download | wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip |
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to 'src/Wallabag/CoreBundle/DataFixtures')
4 files changed, 26 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php index 03be9667..921c739f 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php | |||
@@ -20,6 +20,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface | |||
20 | $adminConfig->setItemsPerPage(30); | 20 | $adminConfig->setItemsPerPage(30); |
21 | $adminConfig->setReadingSpeed(1); | 21 | $adminConfig->setReadingSpeed(1); |
22 | $adminConfig->setLanguage('en'); | 22 | $adminConfig->setLanguage('en'); |
23 | $adminConfig->setPocketConsumerKey('xxxxx'); | ||
23 | 24 | ||
24 | $manager->persist($adminConfig); | 25 | $manager->persist($adminConfig); |
25 | 26 | ||
@@ -30,6 +31,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface | |||
30 | $bobConfig->setItemsPerPage(10); | 31 | $bobConfig->setItemsPerPage(10); |
31 | $bobConfig->setReadingSpeed(1); | 32 | $bobConfig->setReadingSpeed(1); |
32 | $bobConfig->setLanguage('fr'); | 33 | $bobConfig->setLanguage('fr'); |
34 | $bobConfig->setPocketConsumerKey(null); | ||
33 | 35 | ||
34 | $manager->persist($bobConfig); | 36 | $manager->persist($bobConfig); |
35 | 37 | ||
@@ -40,6 +42,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface | |||
40 | $emptyConfig->setItemsPerPage(10); | 42 | $emptyConfig->setItemsPerPage(10); |
41 | $emptyConfig->setReadingSpeed(1); | 43 | $emptyConfig->setReadingSpeed(1); |
42 | $emptyConfig->setLanguage('en'); | 44 | $emptyConfig->setLanguage('en'); |
45 | $emptyConfig->setPocketConsumerKey(null); | ||
43 | 46 | ||
44 | $manager->persist($emptyConfig); | 47 | $manager->persist($emptyConfig); |
45 | 48 | ||
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php index 6c6a331a..fedad009 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php | |||
@@ -23,6 +23,9 @@ class LoadEntryData extends AbstractFixture implements OrderedFixtureInterface | |||
23 | $entry1->setContent('This is my content /o/'); | 23 | $entry1->setContent('This is my content /o/'); |
24 | $entry1->setLanguage('en'); | 24 | $entry1->setLanguage('en'); |
25 | 25 | ||
26 | $entry1->addTag($this->getReference('foo-tag')); | ||
27 | $entry1->addTag($this->getReference('baz-tag')); | ||
28 | |||
26 | $manager->persist($entry1); | 29 | $manager->persist($entry1); |
27 | 30 | ||
28 | $this->addReference('entry1', $entry1); | 31 | $this->addReference('entry1', $entry1); |
@@ -96,6 +99,7 @@ class LoadEntryData extends AbstractFixture implements OrderedFixtureInterface | |||
96 | $entry6->setContent('This is my content /o/'); | 99 | $entry6->setContent('This is my content /o/'); |
97 | $entry6->setArchived(true); | 100 | $entry6->setArchived(true); |
98 | $entry6->setLanguage('de'); | 101 | $entry6->setLanguage('de'); |
102 | $entry6->addTag($this->getReference('bar-tag')); | ||
99 | 103 | ||
100 | $manager->persist($entry6); | 104 | $manager->persist($entry6); |
101 | 105 | ||
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php index 09058796..9425f961 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php | |||
@@ -16,6 +16,11 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface | |||
16 | { | 16 | { |
17 | $settings = [ | 17 | $settings = [ |
18 | [ | 18 | [ |
19 | 'name' => 'share_public', | ||
20 | 'value' => '1', | ||
21 | 'section' => 'entry', | ||
22 | ], | ||
23 | [ | ||
19 | 'name' => 'carrot', | 24 | 'name' => 'carrot', |
20 | 'value' => '1', | 25 | 'value' => '1', |
21 | 'section' => 'entry', | 26 | 'section' => 'entry', |
@@ -86,8 +91,13 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface | |||
86 | 'section' => 'export', | 91 | 'section' => 'export', |
87 | ], | 92 | ], |
88 | [ | 93 | [ |
89 | 'name' => 'pocket_consumer_key', | 94 | 'name' => 'import_with_redis', |
90 | 'value' => null, | 95 | 'value' => '0', |
96 | 'section' => 'import', | ||
97 | ], | ||
98 | [ | ||
99 | 'name' => 'import_with_rabbitmq', | ||
100 | 'value' => '0', | ||
91 | 'section' => 'import', | 101 | 'section' => 'import', |
92 | ], | 102 | ], |
93 | [ | 103 | [ |
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php index 8553dced..09e99f36 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php | |||
@@ -28,6 +28,13 @@ class LoadTagData extends AbstractFixture implements OrderedFixtureInterface | |||
28 | 28 | ||
29 | $this->addReference('bar-tag', $tag2); | 29 | $this->addReference('bar-tag', $tag2); |
30 | 30 | ||
31 | $tag3 = new Tag(); | ||
32 | $tag3->setLabel('baz'); | ||
33 | |||
34 | $manager->persist($tag3); | ||
35 | |||
36 | $this->addReference('baz-tag', $tag3); | ||
37 | |||
31 | $manager->flush(); | 38 | $manager->flush(); |
32 | } | 39 | } |
33 | 40 | ||