MongoDb: as its experimental do not invalid constructor args

Author: soyuka

src/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilter.php

@@ -42,14 +42,10 @@ final class SearchFilter extends AbstractFilter implements SearchFilterInterface
 
     public const DOCTRINE_INTEGER_TYPE = MongoDbType::INTEGER;
 
-    public function __construct(ManagerRegistry $managerRegistry, IriConverterInterface $iriConverter, PropertyAccessorInterface $propertyAccessor = null, LoggerInterface $logger = null, array $properties = null, IdentifiersExtractorInterface $identifiersExtractor = null)
+    public function __construct(ManagerRegistry $managerRegistry, IriConverterInterface $iriConverter, IdentifiersExtractorInterface $identifiersExtractor, PropertyAccessorInterface $propertyAccessor = null, LoggerInterface $logger = null, array $properties = null)
     {
         parent::__construct($managerRegistry, $logger, $properties);
 
-        if (null === $identifiersExtractor) {
-            @trigger_error('Not injecting ItemIdentifiersExtractor is deprecated since API Platform 2.5 and can lead to unexpected behaviors, it will not be possible anymore in API Platform 3.0.', E_USER_DEPRECATED);
-        }
-
         $this->iriConverter = $iriConverter;
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
         $this->identifiersExtractor = $identifiersExtractor;

src/Bridge/Doctrine/Orm/Filter/SearchFilter.php

@@ -49,8 +49,8 @@ public function __construct(ManagerRegistry $managerRegistry, ?RequestStack $req
         }
 
         $this->iriConverter = $iriConverter;
-        $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
         $this->identifiersExtractor = $identifiersExtractor;
+        $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
     }
 
     protected function getIriConverter(): IriConverterInterface

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

@@ -64,9 +64,9 @@
         <service id="api_platform.doctrine_mongodb.odm.search_filter" class="ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\SearchFilter" public="false" abstract="true">
             <argument type="service" id="doctrine_mongodb" />
             <argument type="service" id="api_platform.iri_converter" />
+            <argument type="service" id="api_platform.identifiers_extractor.cached" />
             <argument type="service" id="api_platform.property_accessor" />
             <argument type="service" id="logger" on-invalid="ignore" />
-            <argument key="$identifiersExtractor" type="service" id="api_platform.identifiers_extractor.cached" on-invalid="ignore" />
         </service>
 
         <service id="ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Filter\SearchFilter" alias="api_platform.doctrine_mongodb.odm.search_filter" />

src/GraphQl/Serializer/ObjectNormalizer.php

@@ -15,6 +15,7 @@
 
 use ApiPlatform\Core\Api\IdentifiersExtractorInterface;
 use ApiPlatform\Core\Api\IriConverterInterface;
+use ApiPlatform\Core\Util\ClassInfoTrait;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -25,6 +26,8 @@
  */
 final class ObjectNormalizer implements NormalizerInterface, CacheableSupportsMethodInterface
 {
+    use ClassInfoTrait;
+
     public const FORMAT = 'graphql';
     public const ITEM_RESOURCE_CLASS_KEY = '#itemResourceClass';
     public const ITEM_IDENTIFIERS_KEY = '#itemIdentifiers';

tests/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilterTest.php

@@ -551,19 +551,6 @@ public function provideApplyTestData(): array
         );
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Not injecting ItemIdentifiersExtractor is deprecated since API Platform 2.5 and can lead to unexpected behaviors, it will not be possible anymore in API Platform 3.0.
-     */
-    public function testNotPassingIdentifiersExtractor()
-    {
-        $iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
-        $iriConverter = $iriConverterProphecy->reveal();
-        $propertyAccessor = self::$kernel->getContainer()->get('test.property_accessor');
-
-        return new SearchFilter($this->managerRegistry, $iriConverter, $propertyAccessor, null, null, null);
-    }
-
     protected function buildSearchFilter(ManagerRegistry $managerRegistry, ?array $properties = null)
     {
         $relatedDummyProphecy = $this->prophesize(RelatedDummy::class);
@@ -585,6 +572,6 @@ protected function buildSearchFilter(ManagerRegistry $managerRegistry, ?array $p
         $identifierExtractorProphecy = $this->prophesize(IdentifiersExtractorInterface::class);
         $identifierExtractorProphecy->getIdentifiersFromResourceClass(Argument::type('string'))->willReturn(['id']);
 
-        return new SearchFilter($managerRegistry, $iriConverter, $propertyAccessor, null, $properties, $identifierExtractorProphecy->reveal());
+        return new SearchFilter($managerRegistry, $iriConverter, $identifierExtractorProphecy->reveal(), $propertyAccessor, null, $properties);
     }
 }