summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json21
1 files changed, 14 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index b9548c4..a8d1e6b 100644
--- a/composer.json
+++ b/composer.json
@@ -20,13 +20,12 @@
"ext-xml": "*",
"doctrine/event-manager": "~1.0",
"doctrine/persistence": "~1.0",
- "fig/link-util": "^1.0",
- "twig/twig": "^1.41|^2.10",
+ "twig/twig": "^1.41|^2.10|^3.0",
"psr/cache": "~1.0",
"psr/container": "^1.0",
"psr/link": "^1.0",
"psr/log": "~1.0",
- "symfony/contracts": "^1.1.3",
+ "symfony/contracts": "^1.1.8",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/polyfill-intl-idn": "^1.10",
@@ -48,6 +47,7 @@
"symfony/doctrine-bridge": "self.version",
"symfony/dom-crawler": "self.version",
"symfony/dotenv": "self.version",
+ "symfony/error-handler": "self.version",
"symfony/event-dispatcher": "self.version",
"symfony/expression-language": "self.version",
"symfony/filesystem": "self.version",
@@ -106,21 +106,28 @@
"doctrine/dbal": "~2.4",
"doctrine/orm": "~2.4,>=2.4.5",
"doctrine/reflection": "~1.0",
- "doctrine/doctrine-bundle": "~1.4",
+ "doctrine/doctrine-bundle": "^1.5|^2.0",
+ "guzzlehttp/promises": "^1.3.1",
"masterminds/html5": "^2.6",
- "monolog/monolog": "~1.11",
+ "monolog/monolog": "^1.25.1",
"nyholm/psr7": "^1.0",
"ocramius/proxy-manager": "^2.1",
+ "paragonie/sodium_compat": "^1.8",
+ "php-http/httplug": "^1.0|^2.0",
"predis/predis": "~1.1",
"psr/http-client": "^1.0",
"psr/simple-cache": "^1.0",
"egulias/email-validator": "~1.2,>=1.2.8|~2.0",
"symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0",
"symfony/security-acl": "~2.8|~3.0",
- "phpdocumentor/reflection-docblock": "^3.0|^4.0"
+ "phpdocumentor/reflection-docblock": "^3.0|^4.0",
+ "twig/cssinliner-extra": "^2.12",
+ "twig/inky-extra": "^2.12",
+ "twig/markdown-extra": "^2.12"
},
"conflict": {
"masterminds/html5": "<2.6",
+ "monolog/monolog": ">=2",
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
"phpdocumentor/type-resolver": "<0.3.0",
"ocramius/proxy-manager": "<2.1",
@@ -154,7 +161,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
}
}