aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/DoctrineMigrations/Version20161106113822.php1
-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
4 files changed, 4 insertions, 3 deletions
diff --git a/app/DoctrineMigrations/Version20161106113822.php b/app/DoctrineMigrations/Version20161106113822.php
index 5032a8f0..55bd87a2 100644
--- a/app/DoctrineMigrations/Version20161106113822.php
+++ b/app/DoctrineMigrations/Version20161106113822.php
@@ -35,6 +35,7 @@ class Version20161106113822 extends AbstractMigration implements ContainerAwareI
35 35
36 $configTable->addColumn('action_mark_as_read', 'integer', [ 36 $configTable->addColumn('action_mark_as_read', 'integer', [
37 'default' => 0, 37 'default' => 0,
38 'notnull' => false,
38 ]); 39 ]);
39 } 40 }
40 41
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 */