Merge branch '2.4'

Author: dunglas

.travis.yml

@@ -44,7 +44,6 @@ jobs:
           composer remove --dev --no-progress --no-update --ansi \
             doctrine/mongodb-odm \
             doctrine/mongodb-odm-bundle \
-        - sed -i '33,39d' tests/Fixtures/app/config/config_common.yml
         - *update-project-dependencies
       before_script:
         - *clear-test-app-cache

src/Bridge/Doctrine/Common/Filter/SearchFilterTrait.php

@@ -120,9 +120,9 @@ abstract protected function normalizePropertyName($property);
     protected function getIdFromValue(string $value)
     {
         try {
-            if (null !== $item = $this->getIriConverter()->getItemFromIri($value, ['fetch_data' => false])) {
-                return $this->getPropertyAccessor()->getValue($item, 'id');
-            }
+            $item = $this->getIriConverter()->getItemFromIri($value, ['fetch_data' => false]);
+
+            return $this->getPropertyAccessor()->getValue($item, 'id');
         } catch (InvalidArgumentException $e) {
             // Do nothing, return the raw value
         }

tests/Fixtures/app/AppKernel.php

@@ -137,6 +137,19 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
 
         $c->loadFromExtension('security', $securityConfig);
 
+        if (class_exists(DoctrineMongoDBBundle::class)) {
+            $c->loadFromExtension('doctrine_mongodb', [
+                'connections' => [
+                    'default' => null,
+                ],
+                'document_managers' => [
+                    'default' => [
+                        'auto_mapping' => true,
+                    ],
+                ],
+            ]);
+        }
+
         if ($_SERVER['LEGACY'] ?? true) {
             $c->loadFromExtension('nelmio_api_doc', [
                 'sandbox' => [

tests/Fixtures/app/config/config_common.yml

@@ -30,13 +30,6 @@ doctrine:
         auto_generate_proxy_classes:   '%kernel.debug%'
         auto_mapping:                  true
 
-doctrine_mongodb:
-    connections:
-        default: ~
-    document_managers:
-        default:
-            auto_mapping: true
-
 twig:
     strict_variables: '%kernel.debug%'