Merge remote-tracking branch 'origin/master' into 2.4

1 files changed, 6 insertions, 23 deletions

diff --git a/app/DoctrineMigrations/Version20170511211659.php b/app/DoctrineMigrations/Version20170511211659.php
index f004d1b3..00ce7b1f 100644
--- a/app/DoctrineMigrations/Version20170511211659.php
+++ b/app/DoctrineMigrations/Version20170511211659.php
@@ -2,27 +2,15 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Increase the length of the "quote" column of "annotation" table.
  */
-class Version20170511211659 extends AbstractMigration implements ContainerAwareInterface
+class Version20170511211659 extends WallabagMigration
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-
     public function up(Schema $schema)
     {
         $tableName = $this->getTable('annotation');
@@ -30,8 +18,8 @@ class Version20170511211659 extends AbstractMigration implements ContainerAwareI
         switch ($this->connection->getDatabasePlatform()->getName()) {
             case 'sqlite':
                 $this->addSql(<<<EOD
-CREATE TEMPORARY TABLE __temp__wallabag_annotation AS 
-    SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges 
+CREATE TEMPORARY TABLE __temp__wallabag_annotation AS
+    SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges
     FROM ${tableName}
 EOD
                 );
@@ -56,8 +44,8 @@ EOD
                 );
 
                 $this->addSql(<<<EOD
-INSERT INTO ${tableName} (id, user_id, entry_id, text, created_at, updated_at, quote, ranges) 
-SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges 
+INSERT INTO ${tableName} (id, user_id, entry_id, text, created_at, updated_at, quote, ranges)
+SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges
 FROM __temp__wallabag_annotation;
 EOD
                 );
@@ -88,9 +76,4 @@ EOD
                 break;
         }
     }
-
-    private function getTable($tableName)
-    {
-        return $this->container->getParameter('database_table_prefix') . $tableName;
-    }
 }