Merge remote-tracking branch 'upstream/4.1' into 4.2

Author: soyuka

tests/Functional/JsonLdTest.php

@@ -172,6 +172,10 @@ public function testItemUriTemplate(): void
     public function testItemUriTemplateWithStateOption(): void
     {
         $container = static::getContainer();
+        if ('mongodb' === $container->getParameter('kernel.environment')) {
+            $this->markTestSkipped();
+        }
+
         $registry = $container->get('doctrine');
         $manager = $registry->getManager();
         for ($i = 0; $i < 10; ++$i) {

tests/Symfony/Bundle/DependencyInjection/ConfigurationTest.php

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