Merge branch '3.4'

* 3.4:
  conflict for phpdocumentor/reflection-docblock 3.2

Author: fabpot

composer.json

@@ -98,7 +98,7 @@
         "phpdocumentor/reflection-docblock": "^3.0"
     },
     "conflict": {
-        "phpdocumentor/reflection-docblock": "<3.0",
+        "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
         "phpdocumentor/type-resolver": "<0.2.0",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
     },

src/Symfony/Component/PropertyInfo/composer.json

@@ -34,7 +34,7 @@
         "doctrine/annotations": "~1.0"
     },
     "conflict": {
-        "phpdocumentor/reflection-docblock": "<3.0",
+        "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
         "phpdocumentor/type-resolver": "<0.2.0",
         "symfony/dependency-injection": "<3.4"
     },