fix(metadata): wrong service loaded w/ backward compatibility (#4716)

Author: soyuka

src/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml

@@ -108,14 +108,6 @@
             <tag name="api_platform.doctrine_mongodb.odm.aggregation_extension.collection" priority="16" />
         </service>
         <service id="ApiPlatform\Doctrine\Odm\Extension\OrderExtension" alias="api_platform.doctrine_mongodb.odm.aggregation_extension.order" />
-
-        <service id="api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory"
-                 class="ApiPlatform\Doctrine\Odm\Metadata\Property\DoctrineMongoDbOdmPropertyMetadataFactory"
-                 decorates="api_platform.metadata.property.identifier_metadata_factory"
-                 decoration-priority="40">
-            <argument type="service" id="doctrine_mongodb"/>
-            <argument type="service" id="api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory.inner"/>
-        </service>
     </services>
 
 </container>

src/Symfony/Bundle/Resources/config/v3/doctrine_odm.xml

@@ -45,5 +45,13 @@
             <argument type="service" id="doctrine_mongodb" />
             <argument type="service" id="api_platform.doctrine.odm.metadata.resource.metadata_collection_factory.inner" />
         </service>
+
+        <service id="api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory"
+                 class="ApiPlatform\Doctrine\Odm\Metadata\Property\DoctrineMongoDbOdmPropertyMetadataFactory"
+                 decorates="api_platform.metadata.property.identifier_metadata_factory"
+                 decoration-priority="40">
+            <argument type="service" id="doctrine_mongodb"/>
+            <argument type="service" id="api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory.inner"/>
+        </service>
     </services>
 </container>

tests/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

@@ -178,6 +178,11 @@ private function assertContainerHas(array $services, array $aliases = [])
         }
     }
 
+    private function assertNotContainerHasService(string $service)
+    {
+        $this->assertFalse($this->container->hasDefinition($service), sprintf('Service "%s" found.', $service));
+    }
+
     private function assertContainerHasAlias(string $alias)
     {
         $this->assertTrue($this->container->hasAlias($alias), sprintf('Alias "%s" not found.', $alias));
@@ -1752,6 +1757,8 @@ public function testLegacyServicesMetadataBackwardCompatibilityLayer(): void
         $this->assertServiceHasTags('api_platform.identifier.date_normalizer', ['api_platform.identifier.denormalizer']);
         $this->assertServiceHasTags('api_platform.listener.view.write.legacy', ['kernel.event_listener']);
         $this->assertServiceHasTags('api_platform.listener.request.read.legacy', ['kernel.event_listener']);
+
+        $this->assertNotContainerHasService('api_platform.doctrine_mongodb.odm.metadata.property.identifier_metadata_factory');
     }
 
     public function testRectorConfiguration(): void