feat: add support of collection to MCP

src/Mcp/Capability/Registry/Loader.php

@@ -47,17 +47,22 @@ public function load(RegistryInterface $registry): void
                 foreach ($resource->getMcp() ?? [] as $mcp) {
                     if ($mcp instanceof McpTool) {
                         $inputClass = $mcp->getInput()['class'] ?? $mcp->getClass();
-                        $schema = $this->schemaFactory->buildSchema($inputClass, 'json', Schema::TYPE_INPUT, $mcp, null, [SchemaFactory::FORCE_SUBSCHEMA => true]);
-                        $outputSchema = $this->schemaFactory->buildSchema($inputClass, 'json', Schema::TYPE_OUTPUT, $mcp, null, [SchemaFactory::FORCE_SUBSCHEMA => true]);
+                        $inputFormat = array_first($mcp->getInputFormats() ?? ['json']);
+                        $inputSchema = $this->schemaFactory->buildSchema($inputClass, $inputFormat, Schema::TYPE_INPUT, $mcp, null, [SchemaFactory::FORCE_SUBSCHEMA => true]);
+
+                        $outputClass = $mcp->getOutput()['class'] ?? $mcp->getClass();
+                        $outputFormat = array_first($mcp->getOutputFormats() ?? ['jsonld']);
+                        $outputSchema = $this->schemaFactory->buildSchema($outputClass, $outputFormat, Schema::TYPE_OUTPUT, $mcp, null, [SchemaFactory::FORCE_SUBSCHEMA => true]);
+
                         $registry->registerTool(
                             new Tool(
                                 name: $mcp->getName(),
-                                inputSchema: $schema->getDefinitions()[$schema->getRootDefinitionKey()]->getArrayCopy(),
+                                inputSchema: $inputSchema->getDefinitions()[$inputSchema->getRootDefinitionKey()]->getArrayCopy(),
                                 description: $mcp->getDescription(),
                                 annotations: $mcp->getAnnotations() ? ToolAnnotations::fromArray($mcp->getAnnotations()) : null,
                                 icons: $mcp->getIcons(),
                                 meta: $mcp->getMeta(),
-                                outputSchema: $outputSchema->getDefinitions()[$outputSchema->getRootDefinitionKey()]->getArrayCopy(),
+                                outputSchema: $outputSchema->getArrayCopy(),
                             ),
                             self::HANDLER,
                             true,

src/Mcp/State/StructuredContentProcessor.php

@@ -63,7 +63,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
                 'operation' => $operation,
             ]);
             $serializerContext['uri_variables'] = $uriVariables;
-            $format = $request->getRequestFormat('') ?: 'json';
+            $format = $request->getRequestFormat('') ?: 'jsonld';
             $structuredContent = $this->serializer->normalize($result, $format, $serializerContext);
             $result = $this->serializer->encode($structuredContent, $format, $serializerContext);
         }

src/Mcp/composer.json

@@ -30,7 +30,8 @@
         "php": ">=8.2",
         "api-platform/metadata": "^4.2",
         "api-platform/json-schema": "^4.2",
-        "mcp/sdk": "^0.3.0"
+        "mcp/sdk": "^0.3.0",
+        "symfony/polyfill-php85": "^1.32"
     },
     "autoload": {
         "psr-4": {

src/Metadata/McpTool.php

@@ -20,7 +20,7 @@
 use Symfony\Component\WebLink\Link as WebLink;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-final class McpTool extends HttpOperation
+class McpTool extends HttpOperation
 {
     /**
      * @param string|null                                    $name              The name of the tool (defaults to the method name)

src/Metadata/McpToolCollection.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * 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\Metadata;
+
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
+final class McpToolCollection extends McpTool implements CollectionOperationInterface
+{
+}

src/Metadata/Resource/Factory/InputOutputResourceMetadataCollectionFactory.php

@@ -48,6 +48,10 @@ public function create(string $resourceClass): ResourceMetadataCollection
                 $resourceMetadata = $resourceMetadata->withGraphQlOperations($this->getTransformedOperations($resourceMetadata->getGraphQlOperations(), $resourceMetadata));
             }
 
+            if ($resourceMetadata->getMcp()) {
+                $resourceMetadata = $resourceMetadata->withMcp($this->getTransformedOperations($resourceMetadata->getMcp(), $resourceMetadata));
+            }
+
             $resourceMetadataCollection[$key] = $resourceMetadata;
         }
 

tests/Fixtures/TestBundle/Dto/McpBookOutputDto.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * 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\Tests\Fixtures\TestBundle\Dto;
+
+use ApiPlatform\Tests\Fixtures\TestBundle\Entity\McpBook as McpBookEntity;
+use Symfony\Component\ObjectMapper\Attribute\Map;
+
+#[Map(source: McpBookEntity::class)]
+final class McpBookOutputDto
+{
+    public int $id;
+
+    public string $name;
+
+    public string $isbn;
+
+    public static function fromMcpBook(McpBookEntity $mcpBook): self
+    {
+        $mcpBookOutputDto = new self();
+        $mcpBookOutputDto->id = $mcpBook->getId();
+        $mcpBookOutputDto->name = $mcpBook->getTitle();
+        $mcpBookOutputDto->isbn = $mcpBook->getIsbn();
+
+        return $mcpBookOutputDto;
+    }
+}

tests/Fixtures/TestBundle/Dto/SearchDto.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * 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\Tests\Fixtures\TestBundle\Dto;
+
+final class SearchDto
+{
+    public string $search;
+}

tests/Fixtures/TestBundle/Entity/McpBook.php

@@ -15,6 +15,11 @@
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\McpTool;
+use ApiPlatform\Metadata\McpToolCollection;
+use ApiPlatform\Tests\Fixtures\TestBundle\Dto\McpBookOutputDto;
+use ApiPlatform\Tests\Fixtures\TestBundle\Dto\SearchDto;
+use ApiPlatform\Tests\Fixtures\TestBundle\State\McpBookListDtoProcessor;
+use ApiPlatform\Tests\Fixtures\TestBundle\State\McpBookListProcessor;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ApiResource(
@@ -27,6 +32,19 @@
         'update_book_status' => new McpTool(
             processor: [self::class, 'process']
         ),
+        'list_books' => new McpToolCollection(
+            description: 'List Books',
+            input: SearchDto::class,
+            processor: McpBookListProcessor::class,
+            structuredContent: true,
+        ),
+        'list_books_dto' => new McpTool(
+            description: 'List Books and return a DTO',
+            input: SearchDto::class,
+            output: McpBookOutputDto::class,
+            processor: McpBookListDtoProcessor::class,
+            structuredContent: true,
+        ),
     ]
 )]
 #[ORM\Entity]

tests/Fixtures/TestBundle/State/McpBookListDtoProcessor.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * 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\Tests\Fixtures\TestBundle\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use ApiPlatform\Tests\Fixtures\TestBundle\Dto\McpBookOutputDto;
+use ApiPlatform\Tests\Fixtures\TestBundle\Entity\McpBook;
+use Doctrine\Persistence\ManagerRegistry;
+
+class McpBookListDtoProcessor implements ProcessorInterface
+{
+    public function __construct(private readonly ManagerRegistry $managerRegistry)
+    {
+    }
+
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ?McpBookOutputDto
+    {
+        $search = $context['data']->search ?? null;
+
+        $mcpBookRepository = $this->managerRegistry->getRepository(McpBook::class);
+
+        $queryBuilder = $mcpBookRepository->createQueryBuilder('b');
+        $queryBuilder
+            ->where($queryBuilder->expr()->like('b.title', ':title'))
+            ->setParameter(':title', '%'.$search.'%');
+
+        $book = $queryBuilder->getQuery()->getOneOrNullResult();
+
+        if ($book instanceof McpBook) {
+            return McpBookOutputDto::fromMcpBook($book);
+        }
+
+        return null;
+    }
+}

tests/Fixtures/TestBundle/State/McpBookListProcessor.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * 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\Tests\Fixtures\TestBundle\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use ApiPlatform\Tests\Fixtures\TestBundle\Entity\McpBook;
+use Doctrine\Persistence\ManagerRegistry;
+
+class McpBookListProcessor implements ProcessorInterface
+{
+    public function __construct(private readonly ManagerRegistry $managerRegistry)
+    {
+    }
+
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ?iterable
+    {
+        return $this->managerRegistry->getRepository(McpBook::class)->findAll();
+    }
+}

tests/Fixtures/app/config/config_common.yml

@@ -142,6 +142,17 @@ services:
         tags:
             - name: 'api_platform.state_processor'
 
+    ApiPlatform\Tests\Fixtures\TestBundle\State\McpBookListProcessor:
+        class: 'ApiPlatform\Tests\Fixtures\TestBundle\State\McpBookListProcessor'
+        arguments: [ '@doctrine' ]
+        tags:
+            - name: 'api_platform.state_processor'
+
+    ApiPlatform\Tests\Fixtures\TestBundle\State\McpBookListDtoProcessor:
+        class: 'ApiPlatform\Tests\Fixtures\TestBundle\State\McpBookListDtoProcessor'
+        arguments: [ '@doctrine' ]
+        tags:
+            - name: 'api_platform.state_processor'
 
     ApiPlatform\Tests\Fixtures\TestBundle\State\ContainNonResourceProvider:
         class: 'ApiPlatform\Tests\Fixtures\TestBundle\State\ContainNonResourceProvider'