Be consistent between migration & schema definition

diff --git a/app/DoctrineMigrations/Version20161106113822.php b/app/DoctrineMigrations/Version20161106113822.php
index 5032a8f0563e3cfbe229e5e75dcdeadd9612194f..55bd87a2ccba18a2a85c2b9ff87bf4bfb03c093d 100644 (file)
--- a/app/DoctrineMigrations/Version20161106113822.php
+++ b/app/DoctrineMigrations/Version20161106113822.php
@@ -35,6 +35,7 @@ class Version20161106113822 extends AbstractMigration implements ContainerAwareI
 
         $configTable->addColumn('action_mark_as_read', 'integer', [
             'default' => 0,
+            'notnull' => false,
         ]);
     }
 

diff --git a/src/Wallabag/ApiBundle/Entity/Client.php b/src/Wallabag/ApiBundle/Entity/Client.php
index 427a4c7fed9b7ab3eb92119be7320d1e0f03b709..9ed9f980edb466d2ab696055152c8b5dc088d67d 100644 (file)
--- a/src/Wallabag/ApiBundle/Entity/Client.php
+++ b/src/Wallabag/ApiBundle/Entity/Client.php
@@ -22,7 +22,7 @@ class Client extends BaseClient
     /**
      * @var string
      *
-     * @ORM\Column(name="name", type="text", nullable=true)
+     * @ORM\Column(name="name", type="text", nullable=false)
      */
     protected $name;
 

diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 0b75270d451400bb5235333e01a4422598ffe600..b902ae2cb2ef00d055d5c6ae5605c413ea8519d2 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -93,7 +93,7 @@ class Config
     /**
      * @var int
      *
-     * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true)
+     * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true, options={"default" = 0})
      */
     private $actionMarkAsRead;
 

diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 3cf9ac1a3b061f2928350119bba0be128e66c431..3ae5334f3192788a8acc3beda35326df2061c521 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -183,7 +183,7 @@ class Entry
     /**
      * @var string
      *
-     * @ORM\Column(name="http_status", type="text", nullable=true)
+     * @ORM\Column(name="http_status", type="string", length=3, nullable=true)
      *
      * @Groups({"entries_for_user", "export_all"})
      */