aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-12-23 09:31:41 +0100
committerGitHub <noreply@github.com>2016-12-23 09:31:41 +0100
commit771934632833720c4d0560dc589f22d4f1bdb55e (patch)
treef7811a5f8d918f51030d2aadafe55226370a93e3 /src/Wallabag
parentcd77a7e7eff5d6940a7037387062aa5dde64128c (diff)
parenta72f3dc308f2e4386f73e88af41db919ba0acaf3 (diff)
downloadwallabag-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')
-rw-r--r--src/Wallabag/ApiBundle/Entity/Client.php2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Config.php2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/ApiBundle/Entity/Client.php b/src/Wallabag/ApiBundle/Entity/Client.php
index 427a4c7f..9ed9f980 100644
--- a/src/Wallabag/ApiBundle/Entity/Client.php
+++ b/src/Wallabag/ApiBundle/Entity/Client.php
@@ -22,7 +22,7 @@ class Client extends BaseClient
22 /** 22 /**
23 * @var string 23 * @var string
24 * 24 *
25 * @ORM\Column(name="name", type="text", nullable=true) 25 * @ORM\Column(name="name", type="text", nullable=false)
26 */ 26 */
27 protected $name; 27 protected $name;
28 28
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 */