Merge 4.1

Author: soyuka

tests/Symfony/Bundle/DependencyInjection/ConfigurationTest.php

@@ -234,6 +234,7 @@ private function runDefaultConfigTests(array $doctrineIntegrationsToLoad = ['orm
             'serializer' => [
                 'hydra_prefix' => null,
             ],
+            'enable_phpdoc_parser' => true
         ], $config);
     }