aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/ImportBundle/Import
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-04 15:59:57 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-04 15:59:57 +0100
commite008c037f53324b931f027483f9f1053171109c5 (patch)
tree441c54eb946ffb53a161cad8f686ce7aff875abd /src/Wallabag/ImportBundle/Import
parent74f39b0952440fa0c55e5e8a2e1a8d2bbd3acfd7 (diff)
parent79b9e49d9464e9a67f6ee66fbf6f6c541b1a29f4 (diff)
downloadwallabag-e008c037f53324b931f027483f9f1053171109c5.tar.gz
wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.zst
wallabag-e008c037f53324b931f027483f9f1053171109c5.zip
Merge pull request #1612 from wallabag/v2-settings-page
Settings page
Diffstat (limited to 'src/Wallabag/ImportBundle/Import')
-rw-r--r--src/Wallabag/ImportBundle/Import/PocketImport.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index 617d5514..22932238 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -11,6 +11,7 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
11use Wallabag\CoreBundle\Entity\Entry; 11use Wallabag\CoreBundle\Entity\Entry;
12use Wallabag\CoreBundle\Entity\Tag; 12use Wallabag\CoreBundle\Entity\Tag;
13use Wallabag\CoreBundle\Helper\ContentProxy; 13use Wallabag\CoreBundle\Helper\ContentProxy;
14use Craue\ConfigBundle\Util\Config;
14 15
15class PocketImport implements ImportInterface 16class PocketImport implements ImportInterface
16{ 17{
@@ -24,12 +25,12 @@ class PocketImport implements ImportInterface
24 private $importedEntries = 0; 25 private $importedEntries = 0;
25 protected $accessToken; 26 protected $accessToken;
26 27
27 public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey) 28 public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, Config $craueConfig)
28 { 29 {
29 $this->user = $tokenStorage->getToken()->getUser(); 30 $this->user = $tokenStorage->getToken()->getUser();
30 $this->em = $em; 31 $this->em = $em;
31 $this->contentProxy = $contentProxy; 32 $this->contentProxy = $contentProxy;
32 $this->consumerKey = $consumerKey; 33 $this->consumerKey = $craueConfig->get('pocket_consumer_key');
33 $this->logger = new NullLogger(); 34 $this->logger = new NullLogger();
34 } 35 }
35 36