diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
commit | 44043ebe82a22470e2514d05efac324035ee809a (patch) | |
tree | 5ea40b62ce665a8bab6a3e280a47f3be11838e27 /app/DoctrineMigrations/Version20161128131503.php | |
parent | 11f15430ffc67e30f084cffc8e909ace87ce19e1 (diff) | |
parent | e586d65b64089fc1cc230a18c470aae3f45f91a6 (diff) | |
download | wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.gz wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.zst wallabag-44043ebe82a22470e2514d05efac324035ee809a.zip |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/DoctrineMigrations/Version20161128131503.php')
-rw-r--r-- | app/DoctrineMigrations/Version20161128131503.php | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/app/DoctrineMigrations/Version20161128131503.php b/app/DoctrineMigrations/Version20161128131503.php index 9d92983a..cd434617 100644 --- a/app/DoctrineMigrations/Version20161128131503.php +++ b/app/DoctrineMigrations/Version20161128131503.php | |||
@@ -2,15 +2,13 @@ | |||
2 | 2 | ||
3 | namespace Application\Migrations; | 3 | namespace Application\Migrations; |
4 | 4 | ||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | 5 | use Doctrine\DBAL\Schema\Schema; |
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | 6 | use Wallabag\CoreBundle\Doctrine\WallabagMigration; |
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | 7 | ||
10 | /** | 8 | /** |
11 | * Removed locked, credentials_expire_at and expires_at. | 9 | * Removed locked, credentials_expire_at and expires_at. |
12 | */ | 10 | */ |
13 | class Version20161128131503 extends AbstractMigration implements ContainerAwareInterface | 11 | class Version20161128131503 extends WallabagMigration |
14 | { | 12 | { |
15 | private $fields = [ | 13 | private $fields = [ |
16 | 'locked' => 'smallint', | 14 | 'locked' => 'smallint', |
@@ -19,16 +17,6 @@ class Version20161128131503 extends AbstractMigration implements ContainerAwareI | |||
19 | ]; | 17 | ]; |
20 | 18 | ||
21 | /** | 19 | /** |
22 | * @var ContainerInterface | ||
23 | */ | ||
24 | private $container; | ||
25 | |||
26 | public function setContainer(ContainerInterface $container = null) | ||
27 | { | ||
28 | $this->container = $container; | ||
29 | } | ||
30 | |||
31 | /** | ||
32 | * @param Schema $schema | 20 | * @param Schema $schema |
33 | */ | 21 | */ |
34 | public function up(Schema $schema) | 22 | public function up(Schema $schema) |
@@ -53,9 +41,4 @@ class Version20161128131503 extends AbstractMigration implements ContainerAwareI | |||
53 | $userTable->addColumn($field, $type, ['notnull' => false]); | 41 | $userTable->addColumn($field, $type, ['notnull' => false]); |
54 | } | 42 | } |
55 | } | 43 | } |
56 | |||
57 | private function getTable($tableName) | ||
58 | { | ||
59 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
60 | } | ||
61 | } | 44 | } |