Merge branch '3.3' into 3.4

* 3.3:
  [VarDumper] Fix tests with phpredis 3.1.3
  [DI] Fix reading env vars from fastcgi params
  Allow phpdocumentor/reflection-docblock 4.
  [VarDumper] play nice with open_basedir when looking for composer.json

Author: nicolas-grekas

composer.json

@@ -56,7 +56,7 @@
         "symfony/property-info": "~3.3|~4.0",
         "symfony/web-link": "~3.3|~4.0",
         "doctrine/annotations": "~1.0",
-        "phpdocumentor/reflection-docblock": "^3.0",
+        "phpdocumentor/reflection-docblock": "^3.0|^4.0",
         "twig/twig": "~1.34|~2.4"
     },
     "conflict": {