Merge pull request #3984 from wallabag/2.4

Merge 2.4 into master

1 files changed, 69 insertions, 39 deletions

diff --git a/composer.json b/composer.json
index 0483da1d..55e7f765 100644
--- a/composer.json
+++ b/composer.json
@@ -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": [
@@ -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": "*",
@@ -44,59 +47,68 @@
         "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",
         "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",
-        "j0k3r/graby": "^1.0",
+        "j0k3r/graby": "^2.0",
+        "php-http/guzzle5-adapter": "^2.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",
-        "sulu/symfony-intl-fix": "^1.0"
+        "pragmarx/recovery": "^0.1.0",
+        "php-http/httplug-bundle": "^1.14"
     },
     "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",
+        "php-http/mock-client": "^1.0",
+        "guzzlehttp/psr7": "^1.0"
+    },
+    "suggest": {
+        "ext-imagick": "To keep GIF animation when downloading image is enabled"
     },
     "scripts": {
         "post-cmd": [
@@ -125,22 +137,40 @@
         }
     },
     "autoload": {
-        "psr-4": { "Wallabag\\": "src/Wallabag/" },
-        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ],
-        "exclude-from-classmap": [
-             "vendor/symfony/intl/Locale.php",
-             "vendor/symfony/symfony/src/Symfony/Component/Intl/Locale.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"
+        }
+    ]
 }