$help = 'Needs one of sqlite, mysql or pgsql PDO drivers';
}
- $rows[] = array($label, $status, $help);
+ $rows = [];
+ $rows[] = [$label, $status, $help];
foreach ($this->functionExists as $functionRequired) {
$label = '<comment>'.$functionRequired.'</comment>';
$help = 'You need the '.$functionRequired.' function activated';
}
- $rows[] = array($label, $status, $help);
+ $rows[] = [$label, $status, $help];
}
$table = new Table($this->defaultOutput);
$table
- ->setHeaders(array('Checked', 'Status', 'Recommendation'))
+ ->setHeaders(['Checked', 'Status', 'Recommendation'])
->setRows($rows)
->render();
$this->defaultOutput->writeln('Droping database, creating database and schema, clearing the cache');
$this
- ->runCommand('doctrine:database:drop', array('--force' => true))
+ ->runCommand('doctrine:database:drop', ['--force' => true])
->runCommand('doctrine:database:create')
->runCommand('doctrine:schema:create')
->runCommand('cache:clear')
$this->defaultOutput->writeln('Droping database, creating database and schema');
$this
- ->runCommand('doctrine:database:drop', array('--force' => true))
+ ->runCommand('doctrine:database:drop', ['--force' => true])
->runCommand('doctrine:database:create')
->runCommand('doctrine:schema:create')
;
$this->defaultOutput->writeln('Droping schema and creating schema');
$this
- ->runCommand('doctrine:schema:drop', array('--force' => true))
+ ->runCommand('doctrine:schema:drop', ['--force' => true])
->runCommand('doctrine:schema:create')
;
}
* @param string $command
* @param array $parameters Parameters to this command (usually 'force' => true)
*/
- protected function runCommand($command, $parameters = array())
+ protected function runCommand($command, $parameters = [])
{
$parameters = array_merge(
- array('command' => $command),
+ ['command' => $command],
$parameters,
- array(
+ [
'--no-debug' => true,
'--env' => $this->defaultInput->getOption('env') ?: 'dev',
- )
+ ]
);
if ($this->defaultInput->getOption('no-interaction')) {
- $parameters = array_merge($parameters, array('--no-interaction' => true));
+ $parameters = array_merge($parameters, ['--no-interaction' => true]);
}
$this->getApplication()->setAutoExit(false);
}
/**
- * @param Request $request
- *
* @Route("/new", name="new")
*
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function addEntryAction(Request $request)
+ public function addEntryAction()
{
return $this->render('WallabagCoreBundle:Entry:new.html.twig');
}
* Fetch content using graby and hydrate given entry with results information.
* In case we couldn't find content, we'll try to use Open Graph data.
*
- * @param Entry $entry Entry to update
- * @param string $url Url to grab content for
+ * We can also force the content, in case of an import from the v1 for example, so the function won't
+ * fetch the content from the website but rather use information given with the $content parameter.
+ *
+ * @param Entry $entry Entry to update
+ * @param string $url Url to grab content for
+ * @param array $content An array with AT LEAST keys title, html, url, language & content_type to skip the fetchContent from the url
*
* @return Entry
*/
- public function updateEntry(Entry $entry, $url)
+ public function updateEntry(Entry $entry, $url, array $content = [])
{
- $content = $this->graby->fetchContent($url);
+ // do we have to fetch the content or the provided one is ok?
+ if (empty($content) || false === $this->validateContent($content)) {
+ $content = $this->graby->fetchContent($url);
+ }
$title = $content['title'];
if (!$title && isset($content['open_graph']['og_title'])) {
$entry->setLanguage($content['language']);
$entry->setMimetype($content['content_type']);
$entry->setReadingTime(Utils::getReadingTime($html));
- $entry->setDomainName(parse_url($entry->getUrl(), PHP_URL_HOST));
+
+ $domainName = parse_url($entry->getUrl(), PHP_URL_HOST);
+ if (false !== $domainName) {
+ $entry->setDomainName($domainName);
+ }
if (isset($content['open_graph']['og_image'])) {
$entry->setPreviewPicture($content['open_graph']['og_image']);
}
}
}
+
+ /**
+ * Validate that the given content as enough value to be used
+ * instead of fetch the content from the url.
+ *
+ * @param array $content
+ *
+ * @return bool true if valid otherwise false
+ */
+ private function validateContent(array $content)
+ {
+ return isset($content['title']) && isset($content['html']) && isset($content['url']) && isset($content['language']) && isset($content['content_type']);
+ }
}
class ContentProxyTest extends \PHPUnit_Framework_TestCase
{
+ public function testWithBadUrl()
+ {
+ $tagger = $this->getTaggerMock();
+ $tagger->expects($this->once())
+ ->method('tag');
+
+ $graby = $this->getMockBuilder('Graby\Graby')
+ ->setMethods(array('fetchContent'))
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $graby->expects($this->any())
+ ->method('fetchContent')
+ ->willReturn(array(
+ 'html' => false,
+ 'title' => '',
+ 'url' => '',
+ 'content_type' => '',
+ 'language' => '',
+ ));
+
+ $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger());
+ $entry = $proxy->updateEntry(new Entry(new User()), 'http://user@:80');
+
+ $this->assertEquals('http://user@:80', $entry->getUrl());
+ $this->assertEmpty($entry->getTitle());
+ $this->assertEquals('<p>Unable to retrieve readable content.</p>', $entry->getContent());
+ $this->assertEmpty($entry->getPreviewPicture());
+ $this->assertEmpty($entry->getMimetype());
+ $this->assertEmpty($entry->getLanguage());
+ $this->assertEquals(0.0, $entry->getReadingTime());
+ $this->assertEquals(false, $entry->getDomainName());
+ }
+
public function testWithEmptyContent()
{
$tagger = $this->getTaggerMock();
$this->assertEquals('1.1.1.1', $entry->getDomainName());
}
+ public function testWithForcedContent()
+ {
+ $tagger = $this->getTaggerMock();
+ $tagger->expects($this->once())
+ ->method('tag');
+
+ $graby = $this->getMockBuilder('Graby\Graby')->getMock();
+
+ $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger());
+ $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0', [
+ 'html' => str_repeat('this is my content', 325),
+ 'title' => 'this is my title',
+ 'url' => 'http://1.1.1.1',
+ 'content_type' => 'text/html',
+ 'language' => 'fr',
+ ]);
+
+ $this->assertEquals('http://1.1.1.1', $entry->getUrl());
+ $this->assertEquals('this is my title', $entry->getTitle());
+ $this->assertContains('this is my content', $entry->getContent());
+ $this->assertEquals('text/html', $entry->getMimetype());
+ $this->assertEquals('fr', $entry->getLanguage());
+ $this->assertEquals(4.0, $entry->getReadingTime());
+ $this->assertEquals('1.1.1.1', $entry->getDomainName());
+ }
+
+ public function testTaggerThrowException()
+ {
+ $graby = $this->getMockBuilder('Graby\Graby')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $tagger = $this->getTaggerMock();
+ $tagger->expects($this->once())
+ ->method('tag')
+ ->will($this->throwException(new \Exception()));
+
+ $tagRepo = $this->getTagRepositoryMock();
+ $proxy = new ContentProxy($graby, $tagger, $tagRepo, $this->getLogger());
+
+ $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0', [
+ 'html' => str_repeat('this is my content', 325),
+ 'title' => 'this is my title',
+ 'url' => 'http://1.1.1.1',
+ 'content_type' => 'text/html',
+ 'language' => 'fr',
+ ]);
+
+ $this->assertCount(0, $entry->getTags());
+ }
+
public function testAssignTagsWithArrayAndExtraSpaces()
{
$graby = $this->getMockBuilder('Graby\Graby')
$requestToken = $this->get('wallabag_import.pocket.import')
->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL));
+ if (false === $requestToken) {
+ $this->get('session')->getFlashBag()->add(
+ 'notice',
+ 'flashes.import.notice.failed'
+ );
+
+ return $this->redirect($this->generateUrl('import_pocket'));
+ }
+
$this->get('session')->set('import.pocket.code', $requestToken);
$this->get('session')->set('mark_as_read', $request->request->get('form')['mark_as_read']);
*
* @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)
{
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
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,
$this->assertEquals(1, $crawler->filter('button[type=submit]')->count());
}
+ public function testImportPocketAuthBadToken()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $crawler = $client->request('GET', '/import/pocket/auth');
+
+ $this->assertEquals(302, $client->getResponse()->getStatusCode());
+ }
+
public function testImportPocketAuth()
{
+ $this->markTestSkipped('PocketImport: Find a way to properly mock a service.');
+
$this->logInAs('admin');
$client = $this->getClient();
+ $pocketImport = $this->getMockBuilder('Wallabag\ImportBundle\Import\PocketImport')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $pocketImport
+ ->expects($this->once())
+ ->method('getRequestToken')
+ ->willReturn('token');
+
+ $client->getContainer()->set('wallabag_import.pocket.import', $pocketImport);
+
$crawler = $client->request('GET', '/import/pocket/auth');
$this->assertEquals(301, $client->getResponse()->getStatusCode());
namespace Wallabag\ImportBundle\Tests\Import;
use Wallabag\UserBundle\Entity\User;
+use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\ImportBundle\Import\WallabagV1Import;
use Monolog\Logger;
use Monolog\Handler\TestHandler;
->getMock();
$this->contentProxy
- ->expects($this->once())
+ ->expects($this->exactly(3))
->method('updateEntry')
->willReturn($entry);
->method('getRepository')
->willReturn($entryRepo);
+ $this->contentProxy
+ ->expects($this->exactly(3))
+ ->method('updateEntry')
+ ->willReturn(new Entry($this->user));
+
// check that every entry persisted are archived
$this->em
->expects($this->any())
projects / github / wallabag / wallabag.git / commitdiff
