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

Fix some Scrutinizer issues

Browse Source
This commit is contained in:
Jeremy Benoist
2016-03-27 20:35:56 +02:00
parent 5d6f6f56a2
commit 4d0ec0e721
9 changed files with 183 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ class PocketImport implements ImportInterface
*
* @param string $redirectUri Redirect url in case of error
*
* @return string request_token for callback method
* @return string|false request_token for callback method
*/
public function getRequestToken($redirectUri)
{

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

@ -7,7 +7,6 @@ use Psr\Log\NullLogger;
use Doctrine\ORM\EntityManager;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Tools\Utils;
use Wallabag\CoreBundle\Helper\ContentProxy;
class WallabagV1Import implements ImportInterface
@ -153,19 +152,25 @@ class WallabagV1Import implements ImportInterface
continue;
}
// @see ContentProxy->updateEntry
$entry = new Entry($this->user);
$entry->setUrl($importedEntry['url']);
$data = [
'title' => $importedEntry['title'],
'html' => $importedEntry['content'],
'url' => $importedEntry['url'],
'content_type' => '',
'language' => '',
];
// force content to be refreshed in case on bad fetch in the v1 installation
if (in_array($importedEntry['title'], $untitled)) {
$entry = $this->contentProxy->updateEntry($entry, $importedEntry['url']);
} else {
$entry->setContent($importedEntry['content']);
$entry->setTitle($importedEntry['title']);
$entry->setReadingTime(Utils::getReadingTime($importedEntry['content']));
$entry->setDomainName(parse_url($importedEntry['url'], PHP_URL_HOST));
$data = [];
}
$entry = $this->contentProxy->updateEntry(
new Entry($this->user),
$importedEntry['url'],
$data
);
if (array_key_exists('tags', $importedEntry) && $importedEntry['tags'] != '') {
$this->contentProxy->assignTagsToEntry(
$entry,