From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Thu, 7 Feb 2019 17:01:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 2.4
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=18460b2d79125d0252e7fe71e1ae84d5ef4f040a

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

18460b2d79125d0252e7fe71e1ae84d5ef4f040a
diff --cc composer.json
index 7678d7b8,56ae3f23..b28404e3
--- a/composer.json
+++ b/composer.json
@@@ -46,16 -43,17 +46,17 @@@
          "ext-iconv": "*",
          "ext-tokenizer": "*",
          "ext-pdo": "*",
+         "ext-tidy": "*",
 -        "symfony/symfony": "~3.3.13",
 -        "doctrine/orm": "^2.5.12",
 -        "doctrine/doctrine-bundle": "^1.8.0",
 -        "doctrine/doctrine-cache-bundle": "^1.3.2",
 -        "twig/extensions": "^1.5.1",
 -        "symfony/swiftmailer-bundle": "^2.6.7",
 -        "symfony/monolog-bundle": "^3.1.2",
 -        "sensio/distribution-bundle": "^5.0.21",
 -        "sensio/framework-extra-bundle": "^3.0.28",
 -        "incenteev/composer-parameter-handler": "^2.1.2",
 +        "symfony/symfony": "3.4.*",
 +        "doctrine/orm": "^2.6",
 +        "doctrine/doctrine-bundle": "^1.9",
 +        "doctrine/doctrine-cache-bundle": "^1.3",
 +        "twig/extensions": "^1.5",
 +        "symfony/swiftmailer-bundle": "^3.2",
 +        "symfony/monolog-bundle": "^3.1",
 +        "sensio/distribution-bundle": "^5.0",
 +        "sensio/framework-extra-bundle": "^5.2",
 +        "incenteev/composer-parameter-handler": "^2.1",
          "nelmio/cors-bundle": "~1.5",
          "friendsofsymfony/rest-bundle": "~2.1",
          "jms/serializer-bundle": "~2.2",
diff --cc src/Wallabag/ImportBundle/Import/PocketImport.php
index f2e59183,5737928d..a39d8156
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@@ -206,10 -206,10 +206,10 @@@ class PocketImport extends AbstractImpo
          $this->fetchContent($entry, $url);
  
          // 0, 1, 2 - 1 if the item is archived - 2 if the item should be deleted
-         $entry->updateArchived(1 === $importedEntry['status'] || $this->markAsRead);
 -        $entry->setArchived(1 === (int) $importedEntry['status'] || $this->markAsRead);
++        $entry->updateArchived(1 === (int) $importedEntry['status'] || $this->markAsRead);
  
-         // 0 or 1 - 1 If the item is starred
-         $entry->setStarred(1 === $importedEntry['favorite']);
+         // 0 or 1 - 1 if the item is starred
+         $entry->setStarred(1 === (int) $importedEntry['favorite']);
  
          $title = 'Untitled';
          if (isset($importedEntry['resolved_title']) && '' !== $importedEntry['resolved_title']) {