summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-08-17 09:47:31 +0200
committerRemi Collet <remi@remirepo.net>2018-08-17 09:47:31 +0200
commit528b22904380370a1fa6cb3cac5dbd9e942c8415 (patch)
treebe783dd9e9149f8433cef6b5ecab7d5d92f54ea1 /composer.json
parent4fda67f7d088e97c1a27d3c17ccfad3b4b90704f (diff)
v4.0.14 from Fedora
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index b389ddf..b9c0b1d 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": "^7.1.3",
"ext-xml": "*",
- "doctrine/common": "~2.4",
+ "doctrine/common": "~2.4@stable",
"fig/link-util": "^1.0",
"twig/twig": "^1.35|^2.4.4",
"psr/cache": "~1.0",
@@ -89,7 +89,7 @@
"doctrine/cache": "~1.6",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.4",
- "doctrine/orm": "~2.4,>=2.4.5",
+ "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0",
"doctrine/doctrine-bundle": "~1.4",
"monolog/monolog": "~1.11",
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
@@ -101,7 +101,7 @@
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
- "phpdocumentor/type-resolver": "<0.2.1",
+ "phpdocumentor/type-resolver": "<0.3.0",
"phpunit/phpunit": "<5.4.3"
},
"provide": {