With NCA

Author: VincentLanglet

src/Doctrine/Common/Filter/NameConverterAwareInterface.php

@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Doctrine\Common\Filter;
+
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
+
+interface NameConverterAwareInterface
+{
+    public function hasNameConverter(): bool;
+
+    public function getNameConverter(): NameConverterInterface;
+
+    public function setNameConverter(NameConverterInterface $nameConverter): void;
+}

src/Doctrine/Common/ParameterExtensionTrait.php

@@ -15,11 +15,13 @@
 
 use ApiPlatform\Doctrine\Common\Filter\LoggerAwareInterface;
 use ApiPlatform\Doctrine\Common\Filter\ManagerRegistryAwareInterface;
+use ApiPlatform\Doctrine\Common\Filter\NameConverterAwareInterface;
 use ApiPlatform\Doctrine\Common\Filter\PropertyAwareFilterInterface;
 use ApiPlatform\Metadata\Parameter;
 use Doctrine\Persistence\ManagerRegistry;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
 trait ParameterExtensionTrait
 {
@@ -28,6 +30,7 @@ trait ParameterExtensionTrait
     protected ContainerInterface $filterLocator;
     protected ?ManagerRegistry $managerRegistry = null;
     protected ?LoggerInterface $logger = null;
+    protected ?NameConverterInterface $nameConverter = null;
 
     /**
      * @param object    $filter    the filter instance to configure
@@ -43,6 +46,10 @@ private function configureFilter(object $filter, Parameter $parameter): void
             $filter->setLogger($this->logger);
         }
 
+        if ($this->nameConverter && $filter instanceof NameConverterAwareInterface && !$filter->hasNameConverter()) {
+            $filter->setNameConverter($this->nameConverter);
+        }
+
         if ($filter instanceof PropertyAwareFilterInterface) {
             $properties = [];
             // Check if the filter has getProperties method (e.g., if it's an AbstractFilter)

src/Doctrine/Odm/Extension/ParameterExtension.php

@@ -22,6 +22,7 @@
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
 /**
  * Reads operation parameters and execute its filter.
@@ -36,10 +37,12 @@ public function __construct(
         ContainerInterface $filterLocator,
         ?ManagerRegistry $managerRegistry = null,
         ?LoggerInterface $logger = null,
+        ?NameConverterInterface $nameConverter = null,
     ) {
         $this->filterLocator = $filterLocator;
         $this->managerRegistry = $managerRegistry;
         $this->logger = $logger;
+        $this->nameConverter = $nameConverter;
     }
 
     /**

src/Doctrine/Odm/Filter/AbstractFilter.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Doctrine\Odm\Filter;
 
 use ApiPlatform\Doctrine\Common\Filter\ManagerRegistryAwareInterface;
+use ApiPlatform\Doctrine\Common\Filter\NameConverterAwareInterface;
 use ApiPlatform\Doctrine\Common\Filter\PropertyAwareFilterInterface;
 use ApiPlatform\Doctrine\Common\PropertyHelperTrait;
 use ApiPlatform\Doctrine\Odm\PropertyHelperTrait as MongoDbOdmPropertyHelperTrait;
@@ -32,7 +33,7 @@
  *
  * @author Alan Poulain <[email protected]>
  */
-abstract class AbstractFilter implements FilterInterface, PropertyAwareFilterInterface, ManagerRegistryAwareInterface
+abstract class AbstractFilter implements FilterInterface, PropertyAwareFilterInterface, ManagerRegistryAwareInterface, NameConverterAwareInterface
 {
     use MongoDbOdmPropertyHelperTrait;
     use PropertyHelperTrait;
@@ -136,4 +137,23 @@ protected function normalizePropertyName(string $property): string
 
         return implode('.', array_map($this->nameConverter->normalize(...), explode('.', $property)));
     }
+
+    public function hasNameConverter(): bool
+    {
+        return $this->nameConverter instanceof NameConverterInterface;
+    }
+
+    public function getNameConverter(): NameConverterInterface
+    {
+        if (!$this->hasNameConverter()) {
+            throw new RuntimeException('NameConverter must be initialized before accessing it.');
+        }
+
+        return $this->nameConverter;
+    }
+
+    public function setNameConverter(NameConverterInterface $nameConverter): void
+    {
+        $this->nameConverter = $nameConverter;
+    }
 }

src/Doctrine/Odm/composer.json

@@ -25,7 +25,7 @@
     ],
     "require": {
         "php": ">=8.2",
-        "api-platform/doctrine-common": "^4.2.9",
+        "api-platform/doctrine-common": "^4.2.13",
         "api-platform/metadata": "^4.2",
         "api-platform/state": "^4.2.4",
         "doctrine/mongodb-odm": "^2.10",

src/Doctrine/Orm/Extension/ParameterExtension.php

@@ -22,6 +22,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
 /**
  * Reads operation parameters and execute its filter.
@@ -36,10 +37,12 @@ public function __construct(
         ContainerInterface $filterLocator,
         ?ManagerRegistry $managerRegistry = null,
         ?LoggerInterface $logger = null,
+        ?NameConverterInterface $nameConverter = null,
     ) {
         $this->filterLocator = $filterLocator;
         $this->managerRegistry = $managerRegistry;
         $this->logger = $logger;
+        $this->nameConverter = $nameConverter;
     }
 
     /**

src/Doctrine/Orm/Filter/AbstractFilter.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Doctrine\Orm\Filter;
 
 use ApiPlatform\Doctrine\Common\Filter\ManagerRegistryAwareInterface;
+use ApiPlatform\Doctrine\Common\Filter\NameConverterAwareInterface;
 use ApiPlatform\Doctrine\Common\Filter\PropertyAwareFilterInterface;
 use ApiPlatform\Doctrine\Common\PropertyHelperTrait;
 use ApiPlatform\Doctrine\Orm\PropertyHelperTrait as OrmPropertyHelperTrait;
@@ -26,7 +27,7 @@
 use Psr\Log\NullLogger;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
-abstract class AbstractFilter implements FilterInterface, PropertyAwareFilterInterface, ManagerRegistryAwareInterface
+abstract class AbstractFilter implements FilterInterface, PropertyAwareFilterInterface, ManagerRegistryAwareInterface, NameConverterAwareInterface
 {
     use OrmPropertyHelperTrait;
     use PropertyHelperTrait;
@@ -111,19 +112,38 @@ protected function isPropertyEnabled(string $property, string $resourceClass): b
 
     protected function denormalizePropertyName(string|int $property): string
     {
-        if (!$this->nameConverter instanceof NameConverterInterface) {
+        if (!$this->hasNameConverter()) {
             return (string) $property;
         }
 
-        return implode('.', array_map($this->nameConverter->denormalize(...), explode('.', (string) $property)));
+        return implode('.', array_map($this->getNameConverter()->denormalize(...), explode('.', (string) $property)));
     }
 
     protected function normalizePropertyName(string $property): string
     {
-        if (!$this->nameConverter instanceof NameConverterInterface) {
+        if (!$this->hasNameConverter()) {
             return $property;
         }
 
-        return implode('.', array_map($this->nameConverter->normalize(...), explode('.', $property)));
+        return implode('.', array_map($this->getNameConverter()->normalize(...), explode('.', $property)));
+    }
+
+    public function hasNameConverter(): bool
+    {
+        return $this->nameConverter instanceof NameConverterInterface;
+    }
+
+    public function getNameConverter(): NameConverterInterface
+    {
+        if (!$this->hasNameConverter()) {
+            throw new RuntimeException('NameConverter must be initialized before accessing it.');
+        }
+
+        return $this->nameConverter;
+    }
+
+    public function setNameConverter(NameConverterInterface $nameConverter): void
+    {
+        $this->nameConverter = $nameConverter;
     }
 }

src/Doctrine/Orm/composer.json

@@ -24,7 +24,7 @@
     ],
     "require": {
         "php": ">=8.2",
-        "api-platform/doctrine-common": "^4.2.9",
+        "api-platform/doctrine-common": "^4.2.13",
         "api-platform/metadata": "^4.2",
         "api-platform/state": "^4.2.4",
         "doctrine/orm": "^2.17 || ^3.0"

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

@@ -156,6 +156,7 @@
             service('api_platform.filter_locator'),
             service('doctrine_mongodb')->nullOnInvalid(),
             service('logger')->nullOnInvalid(),
+            service('api_platform.name_converter')->nullOnInvalid(),
         ])
         ->tag('api_platform.doctrine_mongodb.odm.aggregation_extension.collection', ['priority' => 32])
         ->tag('api_platform.doctrine_mongodb.odm.aggregation_extension.item');

src/Symfony/Bundle/Resources/config/doctrine_orm.php

@@ -168,6 +168,7 @@
             service('api_platform.filter_locator'),
             service('doctrine')->nullOnInvalid(),
             service('logger')->nullOnInvalid(),
+            service('api_platform.name_converter')->nullOnInvalid(),
         ])
         ->tag('api_platform.doctrine.orm.query_extension.collection', ['priority' => -16])
         ->tag('api_platform.doctrine.orm.query_extension.item', ['priority' => -9]);