diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-05-11 14:53:56 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-05-11 14:59:53 +0200 |
commit | 1517d5772db05ce86b9958dc6545471d8702bf60 (patch) | |
tree | 66bac04bfd2ea2bf7571502dee4f14623c9d996e | |
parent | dda6a6addc0fd54031514e81d2b55d5066b7157c (diff) | |
download | wallabag-1517d5772db05ce86b9958dc6545471d8702bf60.tar.gz wallabag-1517d5772db05ce86b9958dc6545471d8702bf60.tar.zst wallabag-1517d5772db05ce86b9958dc6545471d8702bf60.zip |
Replaced json_array with array
And fixed failing test due to @j0k3r :trollface:
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Entry.php | 8 | ||||
-rw-r--r-- | tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index f0983b1c..08a67c34 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php | |||
@@ -133,7 +133,7 @@ class Entry | |||
133 | /** | 133 | /** |
134 | * @var array | 134 | * @var array |
135 | * | 135 | * |
136 | * @ORM\Column(name="published_by", type="json_array", nullable=true) | 136 | * @ORM\Column(name="published_by", type="array", nullable=true) |
137 | * | 137 | * |
138 | * @Groups({"entries_for_user", "export_all"}) | 138 | * @Groups({"entries_for_user", "export_all"}) |
139 | */ | 139 | */ |
@@ -204,7 +204,7 @@ class Entry | |||
204 | /** | 204 | /** |
205 | * @var array | 205 | * @var array |
206 | * | 206 | * |
207 | * @ORM\Column(name="headers", type="json_array", nullable=true) | 207 | * @ORM\Column(name="headers", type="array", nullable=true) |
208 | * | 208 | * |
209 | * @Groups({"entries_for_user", "export_all"}) | 209 | * @Groups({"entries_for_user", "export_all"}) |
210 | */ | 210 | */ |
@@ -733,7 +733,7 @@ class Entry | |||
733 | } | 733 | } |
734 | 734 | ||
735 | /** | 735 | /** |
736 | * @param string $publishedBy | 736 | * @param array $publishedBy |
737 | * | 737 | * |
738 | * @return Entry | 738 | * @return Entry |
739 | */ | 739 | */ |
@@ -753,7 +753,7 @@ class Entry | |||
753 | } | 753 | } |
754 | 754 | ||
755 | /** | 755 | /** |
756 | * @param string $headers | 756 | * @param array $headers |
757 | * | 757 | * |
758 | * @return Entry | 758 | * @return Entry |
759 | */ | 759 | */ |
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index 82ac3ac3..698e5e13 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | |||
@@ -915,7 +915,7 @@ class EntryControllerTest extends WallabagCoreTestCase | |||
915 | $this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $entry); | 915 | $this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $entry); |
916 | $this->assertEquals($url, $entry->getUrl()); | 916 | $this->assertEquals($url, $entry->getUrl()); |
917 | $this->assertContains('Perpignan', $entry->getTitle()); | 917 | $this->assertContains('Perpignan', $entry->getTitle()); |
918 | $this->assertContains('/d9bc0fcd.jpeg', $entry->getContent()); | 918 | $this->assertContains('/c4789a7f.jpeg', $entry->getContent()); |
919 | 919 | ||
920 | $client->getContainer()->get('craue_config')->set('download_images_enabled', 0); | 920 | $client->getContainer()->get('craue_config')->set('download_images_enabled', 0); |
921 | } | 921 | } |