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/Version20161024212538.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/Version20161024212538.php')
-rw-r--r-- | app/DoctrineMigrations/Version20161024212538.php | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/app/DoctrineMigrations/Version20161024212538.php b/app/DoctrineMigrations/Version20161024212538.php index 698819be..a7e3c3c8 100644 --- a/app/DoctrineMigrations/Version20161024212538.php +++ b/app/DoctrineMigrations/Version20161024212538.php | |||
@@ -2,28 +2,16 @@ | |||
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 | * Added user_id column on oauth2_clients to prevent users to delete API clients from other users. | 9 | * Added user_id column on oauth2_clients to prevent users to delete API clients from other users. |
12 | */ | 10 | */ |
13 | class Version20161024212538 extends AbstractMigration implements ContainerAwareInterface | 11 | class Version20161024212538 extends WallabagMigration |
14 | { | 12 | { |
15 | /** | ||
16 | * @var ContainerInterface | ||
17 | */ | ||
18 | private $container; | ||
19 | |||
20 | private $constraintName = 'IDX_user_oauth_client'; | 13 | private $constraintName = 'IDX_user_oauth_client'; |
21 | 14 | ||
22 | public function setContainer(ContainerInterface $container = null) | ||
23 | { | ||
24 | $this->container = $container; | ||
25 | } | ||
26 | |||
27 | /** | 15 | /** |
28 | * @param Schema $schema | 16 | * @param Schema $schema |
29 | */ | 17 | */ |
@@ -59,9 +47,4 @@ class Version20161024212538 extends AbstractMigration implements ContainerAwareI | |||
59 | $clientsTable->removeForeignKey($this->constraintName); | 47 | $clientsTable->removeForeignKey($this->constraintName); |
60 | } | 48 | } |
61 | } | 49 | } |
62 | |||
63 | private function getTable($tableName) | ||
64 | { | ||
65 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
66 | } | ||
67 | } | 50 | } |