diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-16 22:58:33 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-16 22:58:33 +0200 |
commit | fbb319f064e6336a3b44bda12cdc51c93c51f379 (patch) | |
tree | 4a8569b4ccc17cd70a07ae9cd567ea73a11a5c05 | |
parent | ebe0787e093f4f2934430033015d6ebad1c64dca (diff) | |
download | wallabag-fbb319f064e6336a3b44bda12cdc51c93c51f379.tar.gz wallabag-fbb319f064e6336a3b44bda12cdc51c93c51f379.tar.zst wallabag-fbb319f064e6336a3b44bda12cdc51c93c51f379.zip |
Missing some migrations
and CS
-rw-r--r-- | app/DoctrineMigrations/Version20160916201049.php | 2 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Import/PocketImport.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/DoctrineMigrations/Version20160916201049.php b/app/DoctrineMigrations/Version20160916201049.php index ac8e6966..202901e6 100644 --- a/app/DoctrineMigrations/Version20160916201049.php +++ b/app/DoctrineMigrations/Version20160916201049.php | |||
@@ -30,6 +30,7 @@ class Version20160916201049 extends AbstractMigration implements ContainerAwareI | |||
30 | public function up(Schema $schema) | 30 | public function up(Schema $schema) |
31 | { | 31 | { |
32 | $this->addSql('ALTER TABLE '.$this->getTable('config').' ADD pocket_consumer_key VARCHAR(255) DEFAULT NULL'); | 32 | $this->addSql('ALTER TABLE '.$this->getTable('config').' ADD pocket_consumer_key VARCHAR(255) DEFAULT NULL'); |
33 | $this->addSql("DELETE FROM `".$this->getTable('craue_config_setting')."` WHERE `name` = 'pocket_consumer_key';"); | ||
33 | } | 34 | } |
34 | 35 | ||
35 | /** | 36 | /** |
@@ -40,5 +41,6 @@ class Version20160916201049 extends AbstractMigration implements ContainerAwareI | |||
40 | $this->abortIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.'); | 41 | $this->abortIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.'); |
41 | 42 | ||
42 | $this->addSql('ALTER TABLE `'.$this->getTable('config').'` DROP pocket_consumer_key'); | 43 | $this->addSql('ALTER TABLE `'.$this->getTable('config').'` DROP pocket_consumer_key'); |
44 | $this->addSql("INSERT INTO `".$this->getTable('craue_config_setting')."` (`name`, `value`, `section`) VALUES ('pocket_consumer_key', NULL, 'import')"); | ||
43 | } | 45 | } |
44 | } | 46 | } |
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php index 40603c90..1bf22d68 100644 --- a/src/Wallabag/ImportBundle/Import/PocketImport.php +++ b/src/Wallabag/ImportBundle/Import/PocketImport.php | |||
@@ -8,7 +8,6 @@ use GuzzleHttp\Client; | |||
8 | use GuzzleHttp\Exception\RequestException; | 8 | use GuzzleHttp\Exception\RequestException; |
9 | use Wallabag\CoreBundle\Entity\Entry; | 9 | use Wallabag\CoreBundle\Entity\Entry; |
10 | use Wallabag\CoreBundle\Helper\ContentProxy; | 10 | use Wallabag\CoreBundle\Helper\ContentProxy; |
11 | use Craue\ConfigBundle\Util\Config; | ||
12 | 11 | ||
13 | class PocketImport extends AbstractImport | 12 | class PocketImport extends AbstractImport |
14 | { | 13 | { |