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

diff --combined composer.json
index 7678d7b87b695b4380507b9eb5fdc430c8b9c356,56ae3f23dec67b540996d8b0067adde655cd6794..b28404e3c8efd19f0c25073c85f6f720fce28237
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -2,10 -2,7 +2,10 @@@
      "name": "wallabag/wallabag",
      "type": "project",
      "description": "open source self hostable read-it-later web application",
 -    "keywords": ["read-it-later","read it later"],
 +    "keywords": [
 +        "read-it-later",
 +        "read it later"
 +    ],
      "homepage": "https://github.com/wallabag/wallabag",
      "license": "MIT",
      "authors": [
@@@ -31,7 -28,7 +31,7 @@@
          "issues": "https://github.com/wallabag/wallabag/issues"
      },
      "require": {
 -        "php": ">=5.6.0",
 +        "php": ">=7.1.3",
          "ext-pcre": "*",
          "ext-dom": "*",
          "ext-curl": "*",
@@@ -46,61 -43,59 +46,62 @@@
          "ext-iconv": "*",
          "ext-tokenizer": "*",
          "ext-pdo": "*",
 -        "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",
+         "ext-tidy": "*",
 +        "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",
          "nelmio/api-doc-bundle": "^2.13.2",
          "mgargano/simplehtmldom": "~1.5",
 -        "wallabag/tcpdf": "^6.2.15",
 +        "wallabag/tcpdf": "^6.2.26",
          "simplepie/simplepie": "~1.5",
          "willdurand/hateoas-bundle": "~1.3",
          "liip/theme-bundle": "^1.4.6",
 -        "lexik/form-filter-bundle": "^5.0.4",
 +        "lexik/form-filter-bundle": "^5.0",
          "j0k3r/graby": "^1.0",
          "friendsofsymfony/user-bundle": "2.0.*",
 -        "friendsofsymfony/oauth-server-bundle": "^1.5.2",
 +        "friendsofsymfony/oauth-server-bundle": "^1.5",
          "stof/doctrine-extensions-bundle": "^1.2",
 -        "scheb/two-factor-bundle": "^2.14.0",
 -        "grandt/phpepub": "^4.0.7",
 -        "wallabag/php-mobi": "~1.0.0",
 +        "scheb/two-factor-bundle": "^3.0",
 +        "grandt/phpepub": "dev-master",
 +        "wallabag/php-mobi": "~1.0",
          "kphoen/rulerz-bundle": "~0.13",
          "guzzlehttp/guzzle": "^5.3.1",
          "doctrine/doctrine-migrations-bundle": "^1.3",
 -        "paragonie/random_compat": "^2.0.11",
 -        "craue/config-bundle": "~2.0",
 +        "craue/config-bundle": "dev-utf8mb4",
          "mnapoli/piwik-twig-extension": "^1.0",
 -        "ocramius/proxy-manager": "^1.0.2",
 -        "white-october/pagerfanta-bundle": "^1.1.0",
 +        "ocramius/proxy-manager": "^2.1.1",
 +        "white-october/pagerfanta-bundle": "^1.1",
          "php-amqplib/rabbitmq-bundle": "^1.14",
 -        "predis/predis": "^1.1.1",
 +        "predis/predis": "v1.1.x-dev",
          "javibravo/simpleue": "^2.0",
 -        "symfony/dom-crawler": "^3.3.13",
 -        "friendsofsymfony/jsrouting-bundle": "^1.6.3",
 +        "symfony/dom-crawler": "^3.4",
 +        "friendsofsymfony/jsrouting-bundle": "^2.2",
          "bdunogier/guzzle-site-authenticator": "^1.0.0",
          "defuse/php-encryption": "^2.1",
 -        "html2text/html2text": "^4.1"
 +        "html2text/html2text": "^4.1",
 +        "pragmarx/recovery": "^0.1.0"
      },
      "require-dev": {
 -        "doctrine/doctrine-fixtures-bundle": "~2.2",
 -        "doctrine/data-fixtures": "~1.1",
 +        "doctrine/doctrine-fixtures-bundle": "~3.0",
          "sensio/generator-bundle": "^3.0",
          "symfony/phpunit-bridge": "^4.2",
 -        "friendsofphp/php-cs-fixer": "~2.0",
 -        "m6web/redis-mock": "^2.0",
 -        "dama/doctrine-test-bundle": "^4.0"
 +        "friendsofphp/php-cs-fixer": "~2.13",
 +        "m6web/redis-mock": "^4.1",
 +        "dama/doctrine-test-bundle": "^5.0",
 +        "phpstan/phpstan": "^0.11.0",
 +        "phpstan/phpstan-phpunit": "^0.11.0",
 +        "phpstan/phpstan-symfony": "^0.11.0",
 +        "phpstan/phpstan-doctrine": "^0.11.0"
      },
      "scripts": {
          "post-cmd": [
@@@ -129,40 -124,18 +130,40 @@@
          }
      },
      "autoload": {
 -        "psr-4": { "Wallabag\\": "src/Wallabag/" },
 -        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
 +        "psr-4": {
 +            "Wallabag\\": "src/Wallabag/"
 +        },
 +        "classmap": [
 +            "app/AppKernel.php",
 +            "app/AppCache.php"
 +        ]
      },
      "autoload-dev": {
 -        "psr-4": { "Tests\\": "tests/" }
 +        "psr-4": {
 +            "Tests\\": "tests/"
 +        },
 +        "files": [
 +            "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php"
 +        ]
      },
      "config": {
          "bin-dir": "bin",
          "platform": {
 -            "php": "5.6.0"
 +            "php": "7.1.3"
          }
      },
      "minimum-stability": "dev",
 -    "prefer-stable": true
 +    "prefer-stable": true,
 +    "repositories": [
 +        {
 +            "type": "vcs",
 +            "url": "https://github.com/Daniel-KM/PHPePub",
 +            "comment": "The most up-to-date PHPePub as of now"
 +        },
 +        {
 +            "type": "vcs",
 +            "url": "https://github.com/wallabag/CraueConfigBundle",
 +            "comment": "To handle utf8mb4 field size"
 +        }
 +    ]
  }

diff --combined src/Wallabag/ImportBundle/Import/PocketImport.php
index f2e5918343a6dc05fa9b6010b09cd799738739d5,5737928d169afd66a3456bb94c8e1d8b6b84b0e8..a39d81568664144a1bf503ff27b80b2537094a6e
--- 1/src/Wallabag/ImportBundle/Import/PocketImport.php
--- 2/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']) {