Merge branch '3.3' into 3.4

* 3.3:
  fix PHP 7.2 compatibility

Author: xabbuh

composer.json

@@ -62,7 +62,7 @@
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0",
-        "phpdocumentor/type-resolver": "<0.2.0",
+        "phpdocumentor/type-resolver": "<0.2.1",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/asset": "<3.3",
         "symfony/console": "<3.4",