oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-06 17:41:01 +00:00
Code Wiki Activity

Replaced json_array with array

Browse source 
And fixed failing test due to @j0k3r :trollface:
This commit is contained in:
Nicolas Lœuillet 2017-05-11 14:53:56 +02:00
parent dda6a6addc
commit 1517d5772d
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Wallabag/CoreBundle/Entity/Entry.php
View file

@ -133,7 +133,7 @@ class Entry
/** /**
* @var array * @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"}) * @Groups({"entries_for_user", "export_all"})
*/ */
@ -204,7 +204,7 @@ class Entry
/** /**
* @var array * @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"}) * @Groups({"entries_for_user", "export_all"})
*/ */
@ -733,7 +733,7 @@ class Entry
} }
/** /**
* @param string $publishedBy * @param array $publishedBy
* *
* @return Entry * @return Entry
*/ */
@ -753,7 +753,7 @@ class Entry
} }
/** /**
* @param string $headers * @param array $headers
* *
* @return Entry * @return Entry
*/ */

2
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View file

@ -915,7 +915,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $entry); $this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $entry);
$this->assertEquals($url, $entry->getUrl()); $this->assertEquals($url, $entry->getUrl());
$this->assertContains('Perpignan', $entry->getTitle()); $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); $client->getContainer()->get('craue_config')->set('download_images_enabled', 0);
} }