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

2019-02-07 18:01:15 +01:00
parent 2e5b3fa361 47e4784110
commit 18460b2d79
6 changed files with 14 additions and 6 deletions
--- a/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
+++ b/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
@ -226,6 +226,13 @@ class PocketImportTest extends TestCase
            ->method('getRepository')
            ->willReturn($entryRepo);

+        $this->em
+            ->expects($this->any())
+            ->method('persist')
+            ->with($this->callback(function ($persistedEntry) {
+                return $persistedEntry->isArchived() && $persistedEntry->isStarred();
+            }));
+
        $entry = new Entry($this->user);

        $this->contentProxy