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

Fix tests

Browse Source
This commit is contained in:
Jeremy Benoist
2017-05-30 17:48:24 +02:00
parent 432a24f502
commit d5c2cc54b5
6 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Wallabag/ImportBundle/Command/ImportCommand.php
View File

@ -20,6 +20,7 @@ class ImportCommand extends ContainerAwareCommand
->addArgument('filepath', InputArgument::REQUIRED, 'Path to the JSON file')
->addOption('importer', null, InputArgument::OPTIONAL, 'The importer to use: v1, v2, instapaper, pinboard, readability, firefox or chrome', 'v1')
->addOption('markAsRead', null, InputArgument::OPTIONAL, 'Mark all entries as read', false)
->addOption('useUserId', null, InputArgument::OPTIONAL, 'Use user id instead of username to find account', false)
->addOption('disableContentUpdate', null, InputOption::VALUE_NONE, 'Disable fetching updated content from URL')
;
}

5
src/Wallabag/ImportBundle/Import/AbstractImport.php
View File

@ -24,7 +24,7 @@ abstract class AbstractImport implements ImportInterface
protected $producer;
protected $user;
protected $markAsRead;
protected $disableContentUpdate;
protected $disableContentUpdate = false;
protected $skippedEntries = 0;
protected $importedEntries = 0;
protected $queuedEntries = 0;
@ -115,6 +115,9 @@ abstract class AbstractImport implements ImportInterface
*/
protected function fetchContent(Entry $entry, $url, array $content = [])
{
// be sure to set at least the given url
$content['url'] = isset($content['url']) ? $content['url'] : $url;
try {
$this->contentProxy->importEntry($entry, $content, $this->disableContentUpdate);
} catch (\Exception $e) {

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

@ -7,12 +7,12 @@ class WallabagV1Import extends WallabagImport
protected $fetchingErrorMessage;
protected $fetchingErrorMessageTitle;
public function __construct($em, $contentProxy, $eventDispatcher, $fetchingErrorMessageTitle, $fetchingErrorMessage)
public function __construct($em, $contentProxy, $tagsAssigner, $eventDispatcher, $fetchingErrorMessageTitle, $fetchingErrorMessage)
{
$this->fetchingErrorMessageTitle = $fetchingErrorMessageTitle;
$this->fetchingErrorMessage = $fetchingErrorMessage;
parent::__construct($em, $contentProxy, $eventDispatcher);
parent::__construct($em, $contentProxy, $tagsAssigner, $eventDispatcher);
}
/**