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

[github/wallabag/wallabag.git] / composer.json

diff --git a/composer.json b/composer.json
index 4f60956767ebe8a0e7583fce11ed1924a364f840..8b28f06510d6467811221295a3a7325747a29fdc 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -73,7 +73,7 @@
         "kphoen/rulerz-bundle": "~0.13",
         "guzzlehttp/guzzle": "^5.3.1",
         "doctrine/doctrine-migrations-bundle": "^1.3",
-        "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",
@@ -82,14 +82,14 @@
         "javibravo/simpleue": "^2.0",
         "symfony/dom-crawler": "^3.4",
         "friendsofsymfony/jsrouting-bundle": "^2.2",
-        "bdunogier/guzzle-site-authenticator": "^1.0.0@dev",
+        "bdunogier/guzzle-site-authenticator": "^1.0.0",
         "defuse/php-encryption": "^2.1",
         "html2text/html2text": "^4.1"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~3.0",
         "sensio/generator-bundle": "^3.0",
-        "symfony/phpunit-bridge": "^3.4",
+        "symfony/phpunit-bridge": "^4.2",
         "friendsofphp/php-cs-fixer": "~2.13",
         "m6web/redis-mock": "^4.1",
         "dama/doctrine-test-bundle": "^5.0"
@@ -148,6 +148,11 @@
             "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"
         }
     ]
 }