Merge remote-tracking branch 'origin/master' into 2.3

diff --cc app/config/config.yml
Simple merge

diff --cc composer.json
Simple merge

diff --cc src/Wallabag/ApiBundle/Controller/EntryRestController.php
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
Simple merge

diff --cc tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index 4f49f040f9e6d9ccfb4db6ef0e20fa0c7740b064,0a65f9cee0628a78a38ab6b2fd7ce259c1383371..bf7d373aa94d57f8716ed59f5f6d02f37ccd3b6f
--- 1/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
--- 2/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
@@@ -372,9 -373,42 +373,42 @@@ class EntryRestControllerTest extends W
          $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']);
          $this->assertEquals(true, $content['is_archived']);
          $this->assertEquals(false, $content['is_starred']);
 -        $this->assertCount(2, $content['tags']);
 +        $this->assertCount(3, $content['tags']);
      }
  
+     public function testPostEntryWhenFetchContentFails()
+     {
+         /** @var \Symfony\Component\DependencyInjection\Container $container */
+         $container = $this->client->getContainer();
+         $contentProxy = $this->getMockBuilder(ContentProxy::class)
+             ->disableOriginalConstructor()
+             ->setMethods(['updateEntry'])
+             ->getMock();
+         $contentProxy->expects($this->any())
+             ->method('updateEntry')
+             ->willThrowException(new \Exception('Test Fetch content fails'));
+         $container->set('wallabag_core.content_proxy', $contentProxy);
+ 
+         try {
+             $this->client->request('POST', '/api/entries.json', [
+                 'url' => 'http://www.example.com/',
+             ]);
+ 
+             $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+             $content = json_decode($this->client->getResponse()->getContent(), true);
+             $this->assertGreaterThan(0, $content['id']);
+             $this->assertEquals('http://www.example.com/', $content['url']);
+         } finally {
+             // Remove the created entry to avoid side effects on other tests
+             if (isset($content['id'])) {
+                 $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
+                 $entry = $em->getReference('WallabagCoreBundle:Entry', $content['id']);
+                 $em->remove($entry);
+                 $em->flush();
+             }
+         }
+     }
+ 
      public function testPostArchivedAndStarredEntry()
      {
          $this->client->request('POST', '/api/entries.json', [

diff --cc tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
Simple merge