pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

updated tests

Browse Source
This commit is contained in:
Nicolas Lœuillet
2016-01-06 06:34:57 +01:00
parent d1af8ad4db
commit b88cf91fc8
9 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Wallabag/ImportBundle/Import/PocketImport.php
View File

@ -11,7 +11,6 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Helper\ContentProxy;
use Symfony\Component\Translation\TranslatorInterface;
class PocketImport implements ImportInterface
{
@ -26,14 +25,13 @@ class PocketImport implements ImportInterface
protected $accessToken;
private $translator;
public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey, TranslatorInterface $translator)
public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey)
{
$this->user = $tokenStorage->getToken()->getUser();
$this->em = $em;
$this->contentProxy = $contentProxy;
$this->consumerKey = $consumerKey;
$this->logger = new NullLogger();
$this->translator = $translator;
}
public function setLogger(LoggerInterface $logger)
@ -62,7 +60,7 @@ class PocketImport implements ImportInterface
*/
public function getDescription()
{
return $this->translator->trans("This importer will import all your <a href=\"https://getpocket.com\">Pocket</a> data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.");
return 'This importer will import all your Pocket data. Pocket doesn\'t allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.';
}
/**

7
src/Wallabag/ImportBundle/Import/WallabagV1Import.php
View File

@ -5,7 +5,6 @@ namespace Wallabag\ImportBundle\Import;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
use Doctrine\ORM\EntityManager;
use Symfony\Component\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Tools\Utils;
@ -18,13 +17,11 @@ class WallabagV1Import implements ImportInterface
private $skippedEntries = 0;
private $importedEntries = 0;
private $filepath;
private $translator;
public function __construct(EntityManager $em, TranslatorInterface $translator)
public function __construct(EntityManager $em)
{
$this->em = $em;
$this->logger = new NullLogger();
$this->translator = $translator;
}
public function setLogger(LoggerInterface $logger)
@ -66,7 +63,7 @@ class WallabagV1Import implements ImportInterface
*/
public function getDescription()
{
return $this->translator->trans('This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.');
return 'This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.';
}
/**