From 645119efd1397fc824fdc362c6206cfc3c8183aa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 11 Nov 2017 08:58:21 +0100
Subject: v3.3.11

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index d55f29f..1c8a702 100644
--- a/composer.json
+++ b/composer.json
@@ -87,6 +87,7 @@
     },
     "require-dev": {
         "cache/integration-tests": "dev-master",
+        "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.6",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
@@ -103,7 +104,7 @@
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
-        "phpdocumentor/type-resolver": "<0.2.0",
+        "phpdocumentor/type-resolver": "<0.2.1",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
     },
     "provide": {
-- 
cgit