diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2018-10-08 08:00:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-08 08:00:07 +0000 |
commit | 102f57941ebfd03899760f8add0701952b4d982f (patch) | |
tree | 004a45801b8e811e97661a156d862da572f14034 /composer.json | |
parent | 2b6380f5acaecaa7aa04c12d7bf4fd7c84b60b08 (diff) | |
parent | 115de64e5bb9d7f9151ecf15e15a0d988563528e (diff) | |
download | wallabag-102f57941ebfd03899760f8add0701952b4d982f.tar.gz wallabag-102f57941ebfd03899760f8add0701952b4d982f.tar.zst wallabag-102f57941ebfd03899760f8add0701952b4d982f.zip |
Merge pull request #3731 from wallabag/symfony3.4
Jump to Symfony 3.4
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/composer.json b/composer.json index 9ed91f20..f209a5c2 100644 --- a/composer.json +++ b/composer.json | |||
@@ -43,7 +43,7 @@ | |||
43 | "ext-iconv": "*", | 43 | "ext-iconv": "*", |
44 | "ext-tokenizer": "*", | 44 | "ext-tokenizer": "*", |
45 | "ext-pdo": "*", | 45 | "ext-pdo": "*", |
46 | "symfony/symfony": "~3.3.13", | 46 | "symfony/symfony": "3.4.*", |
47 | "doctrine/orm": "^2.5.12", | 47 | "doctrine/orm": "^2.5.12", |
48 | "doctrine/doctrine-bundle": "^1.8.0", | 48 | "doctrine/doctrine-bundle": "^1.8.0", |
49 | "doctrine/doctrine-cache-bundle": "^1.3.2", | 49 | "doctrine/doctrine-cache-bundle": "^1.3.2", |
@@ -51,7 +51,7 @@ | |||
51 | "symfony/swiftmailer-bundle": "^2.6.7", | 51 | "symfony/swiftmailer-bundle": "^2.6.7", |
52 | "symfony/monolog-bundle": "^3.1.2", | 52 | "symfony/monolog-bundle": "^3.1.2", |
53 | "sensio/distribution-bundle": "^5.0.21", | 53 | "sensio/distribution-bundle": "^5.0.21", |
54 | "sensio/framework-extra-bundle": "^3.0.28", | 54 | "sensio/framework-extra-bundle": "^5.2.1", |
55 | "incenteev/composer-parameter-handler": "^2.1.2", | 55 | "incenteev/composer-parameter-handler": "^2.1.2", |
56 | "nelmio/cors-bundle": "~1.5", | 56 | "nelmio/cors-bundle": "~1.5", |
57 | "friendsofsymfony/rest-bundle": "~2.1", | 57 | "friendsofsymfony/rest-bundle": "~2.1", |
@@ -82,14 +82,13 @@ | |||
82 | "predis/predis": "^1.1.1", | 82 | "predis/predis": "^1.1.1", |
83 | "javibravo/simpleue": "^2.0", | 83 | "javibravo/simpleue": "^2.0", |
84 | "symfony/dom-crawler": "^3.3.13", | 84 | "symfony/dom-crawler": "^3.3.13", |
85 | "friendsofsymfony/jsrouting-bundle": "^1.6.3", | 85 | "friendsofsymfony/jsrouting-bundle": "^2.2.1", |
86 | "bdunogier/guzzle-site-authenticator": "^1.0.0@dev", | 86 | "bdunogier/guzzle-site-authenticator": "^1.0.0@dev", |
87 | "defuse/php-encryption": "^2.1", | 87 | "defuse/php-encryption": "^2.1", |
88 | "html2text/html2text": "^4.1" | 88 | "html2text/html2text": "^4.1" |
89 | }, | 89 | }, |
90 | "require-dev": { | 90 | "require-dev": { |
91 | "doctrine/doctrine-fixtures-bundle": "~2.2", | 91 | "doctrine/doctrine-fixtures-bundle": "~3.0", |
92 | "doctrine/data-fixtures": "~1.1", | ||
93 | "sensio/generator-bundle": "^3.0", | 92 | "sensio/generator-bundle": "^3.0", |
94 | "symfony/phpunit-bridge": "^3.3", | 93 | "symfony/phpunit-bridge": "^3.3", |
95 | "friendsofphp/php-cs-fixer": "~2.0", | 94 | "friendsofphp/php-cs-fixer": "~2.0", |