diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-12-23 09:31:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-23 09:31:41 +0100 |
| commit | 771934632833720c4d0560dc589f22d4f1bdb55e (patch) | |
| tree | f7811a5f8d918f51030d2aadafe55226370a93e3 /src/Wallabag/CoreBundle | |
| parent | cd77a7e7eff5d6940a7037387062aa5dde64128c (diff) | |
| parent | a72f3dc308f2e4386f73e88af41db919ba0acaf3 (diff) | |
| download | wallabag-771934632833720c4d0560dc589f22d4f1bdb55e.tar.gz wallabag-771934632833720c4d0560dc589f22d4f1bdb55e.tar.zst wallabag-771934632833720c4d0560dc589f22d4f1bdb55e.zip | |
Merge pull request #2696 from wallabag/run-migration
Run migration on each test
Diffstat (limited to 'src/Wallabag/CoreBundle')
| -rw-r--r-- | src/Wallabag/CoreBundle/Entity/Config.php | 2 | ||||
| -rw-r--r-- | src/Wallabag/CoreBundle/Entity/Entry.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index 0b75270d..b902ae2c 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php | |||
| @@ -93,7 +93,7 @@ class Config | |||
| 93 | /** | 93 | /** |
| 94 | * @var int | 94 | * @var int |
| 95 | * | 95 | * |
| 96 | * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true) | 96 | * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true, options={"default" = 0}) |
| 97 | */ | 97 | */ |
| 98 | private $actionMarkAsRead; | 98 | private $actionMarkAsRead; |
| 99 | 99 | ||
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index 3cf9ac1a..3ae5334f 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php | |||
| @@ -183,7 +183,7 @@ class Entry | |||
| 183 | /** | 183 | /** |
| 184 | * @var string | 184 | * @var string |
| 185 | * | 185 | * |
| 186 | * @ORM\Column(name="http_status", type="text", nullable=true) | 186 | * @ORM\Column(name="http_status", type="string", length=3, nullable=true) |
| 187 | * | 187 | * |
| 188 | * @Groups({"entries_for_user", "export_all"}) | 188 | * @Groups({"entries_for_user", "export_all"}) |
| 189 | */ | 189 | */ |