Improve

Author: VincentLanglet

src/Doctrine/Odm/Metadata/Resource/DoctrineMongoDbOdmResourceCollectionMetadataFactory.php

@@ -18,11 +18,14 @@
 use ApiPlatform\Doctrine\Odm\State\Options;
 use ApiPlatform\Metadata\CollectionOperationInterface;
 use ApiPlatform\Metadata\DeleteOperationInterface;
+use ApiPlatform\Metadata\HttpOperation;
+use ApiPlatform\Metadata\Link;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
 use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\Persistence\ManagerRegistry;
 
 final class DoctrineMongoDbOdmResourceCollectionMetadataFactory implements ResourceMetadataCollectionFactoryInterface
@@ -92,9 +95,61 @@ private function addDefaults(Operation $operation): Operation
             $operation = $operation->withProcessor($this->getProcessor($operation));
         }
 
+        if ($operation instanceof HttpOperation) {
+            $operation = $operation->withRequirements($this->getRequirements($operation));
+        }
+
         return $operation;
     }
 
+    /**
+     * @return array<string, string>
+     */
+    private function getRequirements(HttpOperation $operation): array
+    {
+        $requirements = $operation->getRequirements() ?? [];
+        $uriVariables = (array) ($operation->getUriVariables() ?? []);
+
+        foreach ($uriVariables as $paramName => $uriVariable) {
+            if (isset($requirements[$paramName])) {
+                continue;
+            }
+
+            if (!$uriVariable instanceof Link) {
+                continue;
+            }
+
+            $identifiers = $uriVariable->getIdentifiers();
+            if (1 !== \count($identifiers)) {
+                continue;
+            }
+            $fieldName = $identifiers[0];
+
+            $fromClass = $uriVariable->getFromClass();
+            if (null === $fromClass) {
+                continue;
+            }
+            $classMetadata = $this->managerRegistry->getManagerForClass($fromClass)?->getClassMetadata($fromClass);
+
+            $requirement = null;
+            if ($classMetadata instanceof ClassMetadata && $classMetadata->hasField($fieldName)) {
+                $fieldMapping = $classMetadata->getFieldMapping($fieldName);
+                $requirement = match ($fieldMapping['type']) {
+                    'uuid', 'guid' => '^[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$',
+                    'ulid' => '^[0-7][0-9a-hjkmnp-tv-zA-HJKMNP-TV-Z]{25}$',
+                    'smallint', 'integer', 'bigint' => '^-?[0-9]+$',
+                    default => null,
+                };
+            }
+
+            if (null !== $requirement) {
+                $requirements[$paramName] = $requirement;
+            }
+        }
+
+        return $requirements;
+    }
+
     private function getProvider(Operation $operation): string
     {
         if ($operation instanceof CollectionOperationInterface) {

src/Doctrine/Orm/Metadata/Resource/DoctrineOrmResourceCollectionMetadataFactory.php

@@ -26,6 +26,7 @@
 use ApiPlatform\State\Util\StateOptionsTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Mapping\FieldMapping;
 use Doctrine\Persistence\ManagerRegistry;
 
 final class DoctrineOrmResourceCollectionMetadataFactory implements ResourceMetadataCollectionFactoryInterface
@@ -122,17 +123,27 @@ private function getRequirements(HttpOperation $operation): array
                 continue;
             }
             $identifiers = $uriVariable->getIdentifiers();
-            if (1 !== count($identifiers)) {
+            if (1 !== \count($identifiers)) {
                 continue;
             }
+            $fieldName = $identifiers[0];
 
             $fromClass = $uriVariable->getFromClass();
-            $fieldName = $identifiers[0];
+            if (null === $fromClass) {
+                continue;
+            }
             $classMetadata = $this->managerRegistry->getManagerForClass($fromClass)?->getClassMetadata($fromClass);
 
             $requirement = null;
             if ($classMetadata instanceof ClassMetadata && $classMetadata->hasField($fieldName)) {
-                $requirement = match ($classMetadata->getFieldMapping($fieldName)->type) {
+                $fieldMapping = $classMetadata->getFieldMapping($fieldName);
+                if (class_exists(FieldMapping::class)) {
+                    $type = $fieldMapping->type;
+                } else {
+                    $type = $fieldMapping['type'];
+                }
+
+                $requirement = match ($type) {
                     'uuid', 'guid' => '^[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$',
                     'ulid' => '^[0-7][0-9a-hjkmnp-tv-zA-HJKMNP-TV-Z]{25}$',
                     'smallint', 'integer', 'bigint' => '^-?[0-9]+$',