Merge pull request #3011 from wallabag/2.3

wallabag 2.3.0

1 files changed, 19 insertions, 17 deletions

diff --git a/composer.json b/composer.json
index 9336e801..d1f970c7 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=5.5.9",
+        "php": ">=5.6.0",
         "ext-pcre": "*",
         "ext-dom": "*",
         "ext-curl": "*",
@@ -43,7 +43,7 @@
         "ext-iconv": "*",
         "ext-tokenizer": "*",
         "ext-pdo": "*",
-        "symfony/symfony": "3.2.*",
+        "symfony/symfony": "3.3.*",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
@@ -51,21 +51,20 @@
         "symfony/swiftmailer-bundle": "^2.3",
         "symfony/monolog-bundle": "^3.0",
         "sensio/distribution-bundle": "^5.0",
-        "sensio/framework-extra-bundle": "^3.0.2",
+        "sensio/framework-extra-bundle": "^3.0",
         "incenteev/composer-parameter-handler": "^2.0",
-        "nelmio/cors-bundle": "~1.4.0",
+        "nelmio/cors-bundle": "~1.4",
         "friendsofsymfony/rest-bundle": "~2.1",
-        "jms/serializer-bundle": "~1.1",
+        "jms/serializer-bundle": "~2.2",
         "nelmio/api-doc-bundle": "~2.7",
         "mgargano/simplehtmldom": "~1.5",
         "wallabag/tcpdf": "^6.2",
-        "simplepie/simplepie": "~1.3.1",
+        "simplepie/simplepie": "~1.5",
         "willdurand/hateoas-bundle": "~1.0",
-        "htmlawed/htmlawed": "~1.1.19",
         "liip/theme-bundle": "~1.1",
         "lexik/form-filter-bundle": "~5.0",
-        "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "2.0.x-dev",
+        "j0k3r/graby": "^1.0",
+        "friendsofsymfony/user-bundle": "^2.0",
         "friendsofsymfony/oauth-server-bundle": "^1.5",
         "stof/doctrine-extensions-bundle": "^1.2",
         "scheb/two-factor-bundle": "~2.0",
@@ -74,8 +73,8 @@
         "kphoen/rulerz-bundle": "~0.13",
         "guzzlehttp/guzzle": "^5.3.1",
         "doctrine/doctrine-migrations-bundle": "^1.0",
-        "paragonie/random_compat": "~1.0",
-        "craue/config-bundle": "~1.4",
+        "paragonie/random_compat": "~2.0",
+        "craue/config-bundle": "~2.0",
         "mnapoli/piwik-twig-extension": "^1.0",
         "ocramius/proxy-manager": "1.*",
         "white-october/pagerfanta-bundle": "^1.0",
@@ -84,15 +83,18 @@
         "javibravo/simpleue": "^1.0",
         "symfony/dom-crawler": "^3.1",
         "friendsofsymfony/jsrouting-bundle": "^1.6",
-        "bdunogier/guzzle-site-authenticator": "1.0.0-beta1"
+        "bdunogier/guzzle-site-authenticator": "^1.0.0@dev",
+        "defuse/php-encryption": "^2.1",
+        "html2text/html2text": "^4.1"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
-        "doctrine/data-fixtures": "~1.1.1",
+        "doctrine/data-fixtures": "~1.1",
         "sensio/generator-bundle": "^3.0",
-        "symfony/phpunit-bridge": "^3.0",
-        "friendsofphp/php-cs-fixer": "~1.9",
-        "m6web/redis-mock": "^2.0"
+        "symfony/phpunit-bridge": "^3.3",
+        "friendsofphp/php-cs-fixer": "~2.0",
+        "m6web/redis-mock": "^2.0",
+        "dama/doctrine-test-bundle": "^3.0"
     },
     "scripts": {
         "post-cmd": [
@@ -130,7 +132,7 @@
     "config": {
         "bin-dir": "bin",
         "platform": {
-            "php": "5.5.9"
+            "php": "5.6.0"
         }
     },
     "minimum-stability": "dev",