Fixed symlinks issue during release creation

[github/wallabag/wallabag.git] / app / DoctrineMigrations / Version20161122203647.php

diff --git a/app/DoctrineMigrations/Version20161122203647.php b/app/DoctrineMigrations/Version20161122203647.php
index 9c1557ebc3a54f922b0de8b88da6ec8dd73a6149..9b17d6efddfc90547bd02c5f2dc0de527ee7272d 100644 (file)
--- a/app/DoctrineMigrations/Version20161122203647.php
+++ b/app/DoctrineMigrations/Version20161122203647.php
@@ -42,12 +42,9 @@ class Version20161122203647 extends AbstractMigration implements ContainerAwareI
     {
         $userTable = $schema->getTable($this->getTable('user'));
 
-        $this->skipIf(false === $userTable->hasColumn('expired'), 'It seems that you already played this migration.');
+        $this->skipIf(false === $userTable->hasColumn('expired') || false === $userTable->hasColumn('credentials_expired'), 'It seems that you already played this migration.');
 
         $userTable->dropColumn('expired');
-
-        $this->skipIf(false === $userTable->hasColumn('credentials_expired'), 'It seems that you already played this migration.');
-
         $userTable->dropColumn('credentials_expired');
     }
 
@@ -57,7 +54,10 @@ class Version20161122203647 extends AbstractMigration implements ContainerAwareI
     public function down(Schema $schema)
     {
         $userTable = $schema->getTable($this->getTable('user'));
-        $userTable->addColumn('expired', 'smallint');
-        $userTable->addColumn('credentials_expired', 'smallint');
+
+        $this->skipIf(true === $userTable->hasColumn('expired') || true === $userTable->hasColumn('credentials_expired'), 'It seems that you already played this migration.');
+
+        $userTable->addColumn('expired', 'smallint', ['notnull' => false]);
+        $userTable->addColumn('credentials_expired', 'smallint', ['notnull' => false]);
     }
 }