From a795a598d0325a2510c2d45c3aca641e33528556 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 28 Aug 2018 08:37:02 +0200
Subject: v3.4.15

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 8c7d87c..6d5065d 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^5.5.9|>=7.0.8",
         "ext-xml": "*",
-        "doctrine/common": "~2.4@stable",
+        "doctrine/common": "~2.4",
         "fig/link-util": "^1.0",
         "twig/twig": "^1.35|^2.4.4",
         "psr/cache": "~1.0",
@@ -104,7 +104,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": "<4.8.35|<5.4.3,>=5.0"
     },
     "provide": {
-- 
cgit