From 1517d5772db05ce86b9958dc6545471d8702bf60 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 11 May 2017 14:53:56 +0200 Subject: [PATCH] Replaced json_array with array And fixed failing test due to @j0k3r :trollface: --- src/Wallabag/CoreBundle/Entity/Entry.php | 8 ++++---- .../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 /** * @var array * - * @ORM\Column(name="published_by", type="json_array", nullable=true) + * @ORM\Column(name="published_by", type="array", nullable=true) * * @Groups({"entries_for_user", "export_all"}) */ @@ -204,7 +204,7 @@ class Entry /** * @var array * - * @ORM\Column(name="headers", type="json_array", nullable=true) + * @ORM\Column(name="headers", type="array", nullable=true) * * @Groups({"entries_for_user", "export_all"}) */ @@ -733,7 +733,7 @@ class Entry } /** - * @param string $publishedBy + * @param array $publishedBy * * @return Entry */ @@ -753,7 +753,7 @@ class Entry } /** - * @param string $headers + * @param array $headers * * @return Entry */ 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 $this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $entry); $this->assertEquals($url, $entry->getUrl()); $this->assertContains('Perpignan', $entry->getTitle()); - $this->assertContains('/d9bc0fcd.jpeg', $entry->getContent()); + $this->assertContains('/c4789a7f.jpeg', $entry->getContent()); $client->getContainer()->get('craue_config')->set('download_images_enabled', 0); } -- 2.41.0