From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 30 May 2017 07:59:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~85
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=d181bd728565454ec53d960f321ed0a4c3bf26c8;hp=-c;p=github%2Fwallabag%2Fwallabag.git

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

d181bd728565454ec53d960f321ed0a4c3bf26c8
diff --combined app/config/config.yml
index 73bf0a0d,77cda052..9792616e
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@@ -3,11 -3,6 +3,11 @@@ imports
      - { resource: security.yml }
      - { resource: services.yml }
  
 +parameters:
 +    # Allows to use the live reload feature for changes in assets
 +    use_webpack_dev_server: false
 +    craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter
 +
  framework:
      #esi:             ~
      translator:
@@@ -57,10 -52,9 +57,10 @@@ wallabag_core
      reading_speed: 1
      cache_lifetime: 10
      action_mark_as_read: 1
 -    list_mode: 1
 +    list_mode: 0
      fetching_error_message: |
-         wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
+         wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
 +    api_limit_mass_actions: 10
  
  wallabag_user:
      registration_enabled: "%fosuser_registration%"
diff --combined tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index 6494f348,4f70ed0c..77dfd5bf
--- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@@ -7,12 -7,10 +7,12 @@@ use Wallabag\CoreBundle\Helper\ContentP
  use Wallabag\CoreBundle\Entity\Entry;
  use Wallabag\CoreBundle\Entity\Tag;
  use Wallabag\UserBundle\Entity\User;
 +use Wallabag\CoreBundle\Repository\TagRepository;
 +use Wallabag\CoreBundle\Helper\RuleBasedTagger;
  
  class ContentProxyTest extends \PHPUnit_Framework_TestCase
  {
-     private $fetchingErrorMessage = 'wallabag can\'t retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.';
+     private $fetchingErrorMessage = 'wallabag can\'t retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.';
  
      public function testWithBadUrl()
      {
@@@ -35,7 -33,7 +35,7 @@@
                  'language' => '',
              ]);
  
 -        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger(), $this->fetchingErrorMessage);
 +        $proxy = new ContentProxy($graby, $tagger, $this->getLogger(), $this->fetchingErrorMessage);
          $entry = $proxy->updateEntry(new Entry(new User()), 'http://user@:80');
  
          $this->assertEquals('http://user@:80', $entry->getUrl());
@@@ -69,7 -67,7 +69,7 @@@
                  'language' => '',
              ]);
  
 -        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger(), $this->fetchingErrorMessage);
 +        $proxy = new ContentProxy($graby, $tagger, $this->getLogger(), $this->fetchingErrorMessage);
          $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0');
  
          $this->assertEquals('http://0.0.0.0', $entry->getUrl());
@@@ -108,12 -106,12 +108,12 @@@
                  ],
              ]);
  
 -        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger(), $this->fetchingErrorMessage);
 +        $proxy = new ContentProxy($graby, $tagger, $this->getLogger(), $this->fetchingErrorMessage);
          $entry = $proxy->updateEntry(new Entry(new User()), 'http://domain.io');
  
          $this->assertEquals('http://domain.io', $entry->getUrl());
          $this->assertEquals('my title', $entry->getTitle());
 -        $this->assertEquals($this->fetchingErrorMessage . '<p><i>But we found a short description: </i></p>desc', $entry->getContent());
 +        $this->assertEquals($this->fetchingErrorMessage.'<p><i>But we found a short description: </i></p>desc', $entry->getContent());
          $this->assertEmpty($entry->getPreviewPicture());
          $this->assertEmpty($entry->getLanguage());
          $this->assertEmpty($entry->getHttpStatus());
@@@ -149,7 -147,7 +149,7 @@@
                  ],
              ]);
  
 -        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger(), $this->fetchingErrorMessage);
 +        $proxy = new ContentProxy($graby, $tagger, $this->getLogger(), $this->fetchingErrorMessage);
          $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0');
  
          $this->assertEquals('http://1.1.1.1', $entry->getUrl());
@@@ -190,7 -188,7 +190,7 @@@
                  ],
              ]);
  
 -        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger(), $this->fetchingErrorMessage);
 +        $proxy = new ContentProxy($graby, $tagger, $this->getLogger(), $this->fetchingErrorMessage);
          $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0');
  
          $this->assertEquals('http://1.1.1.1', $entry->getUrl());
@@@ -212,7 -210,7 +212,7 @@@
  
          $graby = $this->getMockBuilder('Graby\Graby')->getMock();
  
 -        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger(), $this->fetchingErrorMessage);
 +        $proxy = new ContentProxy($graby, $tagger, $this->getLogger(), $this->fetchingErrorMessage);
          $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',
@@@ -241,7 -239,8 +241,7 @@@
              ->method('tag')
              ->will($this->throwException(new \Exception()));
  
 -        $tagRepo = $this->getTagRepositoryMock();
 -        $proxy = new ContentProxy($graby, $tagger, $tagRepo, $this->getLogger(), $this->fetchingErrorMessage);
 +        $proxy = new ContentProxy($graby, $tagger, $this->getLogger(), $this->fetchingErrorMessage);
  
          $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0', [
              'html' => str_repeat('this is my content', 325),
@@@ -254,14 -253,134 +254,14 @@@
          $this->assertCount(0, $entry->getTags());
      }
  
 -    public function testAssignTagsWithArrayAndExtraSpaces()
 -    {
 -        $graby = $this->getMockBuilder('Graby\Graby')
 -            ->disableOriginalConstructor()
 -            ->getMock();
 -
 -        $tagRepo = $this->getTagRepositoryMock();
 -        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger(), $this->fetchingErrorMessage);
 -
 -        $entry = new Entry(new User());
 -
 -        $proxy->assignTagsToEntry($entry, ['   tag1', 'tag2   ']);
 -
 -        $this->assertCount(2, $entry->getTags());
 -        $this->assertEquals('tag1', $entry->getTags()[0]->getLabel());
 -        $this->assertEquals('tag2', $entry->getTags()[1]->getLabel());
 -    }
 -
 -    public function testAssignTagsWithString()
 -    {
 -        $graby = $this->getMockBuilder('Graby\Graby')
 -            ->disableOriginalConstructor()
 -            ->getMock();
 -
 -        $tagRepo = $this->getTagRepositoryMock();
 -        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger(), $this->fetchingErrorMessage);
 -
 -        $entry = new Entry(new User());
 -
 -        $proxy->assignTagsToEntry($entry, 'tag1, tag2');
 -
 -        $this->assertCount(2, $entry->getTags());
 -        $this->assertEquals('tag1', $entry->getTags()[0]->getLabel());
 -        $this->assertEquals('tag2', $entry->getTags()[1]->getLabel());
 -    }
 -
 -    public function testAssignTagsWithEmptyArray()
 -    {
 -        $graby = $this->getMockBuilder('Graby\Graby')
 -            ->disableOriginalConstructor()
 -            ->getMock();
 -
 -        $tagRepo = $this->getTagRepositoryMock();
 -        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger(), $this->fetchingErrorMessage);
 -
 -        $entry = new Entry(new User());
 -
 -        $proxy->assignTagsToEntry($entry, []);
 -
 -        $this->assertCount(0, $entry->getTags());
 -    }
 -
 -    public function testAssignTagsWithEmptyString()
 -    {
 -        $graby = $this->getMockBuilder('Graby\Graby')
 -            ->disableOriginalConstructor()
 -            ->getMock();
 -
 -        $tagRepo = $this->getTagRepositoryMock();
 -        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger(), $this->fetchingErrorMessage);
 -
 -        $entry = new Entry(new User());
 -
 -        $proxy->assignTagsToEntry($entry, '');
 -
 -        $this->assertCount(0, $entry->getTags());
 -    }
 -
 -    public function testAssignTagsAlreadyAssigned()
 -    {
 -        $graby = $this->getMockBuilder('Graby\Graby')
 -            ->disableOriginalConstructor()
 -            ->getMock();
 -
 -        $tagRepo = $this->getTagRepositoryMock();
 -        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger(), $this->fetchingErrorMessage);
 -
 -        $tagEntity = new Tag();
 -        $tagEntity->setLabel('tag1');
 -
 -        $entry = new Entry(new User());
 -        $entry->addTag($tagEntity);
 -
 -        $proxy->assignTagsToEntry($entry, 'tag1, tag2');
 -
 -        $this->assertCount(2, $entry->getTags());
 -        $this->assertEquals('tag1', $entry->getTags()[0]->getLabel());
 -        $this->assertEquals('tag2', $entry->getTags()[1]->getLabel());
 -    }
 -
 -    public function testAssignTagsNotFlushed()
 -    {
 -        $graby = $this->getMockBuilder('Graby\Graby')
 -            ->disableOriginalConstructor()
 -            ->getMock();
 -
 -        $tagRepo = $this->getTagRepositoryMock();
 -        $tagRepo->expects($this->never())
 -            ->method('__call');
 -
 -        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger(), $this->fetchingErrorMessage);
 -
 -        $tagEntity = new Tag();
 -        $tagEntity->setLabel('tag1');
 -
 -        $entry = new Entry(new User());
 -
 -        $proxy->assignTagsToEntry($entry, 'tag1', [$tagEntity]);
 -
 -        $this->assertCount(1, $entry->getTags());
 -        $this->assertEquals('tag1', $entry->getTags()[0]->getLabel());
 -    }
 -
      private function getTaggerMock()
      {
 -        return $this->getMockBuilder('Wallabag\CoreBundle\Helper\RuleBasedTagger')
 +        return $this->getMockBuilder(RuleBasedTagger::class)
              ->setMethods(['tag'])
              ->disableOriginalConstructor()
              ->getMock();
      }
  
 -    private function getTagRepositoryMock()
 -    {
 -        return $this->getMockBuilder('Wallabag\CoreBundle\Repository\TagRepository')
 -            ->disableOriginalConstructor()
 -            ->getMock();
 -    }
 -
      private function getLogger()
      {
          return new NullLogger();