Merge 4.3

Author: soyuka

composer.json

@@ -142,7 +142,7 @@
         "jangregor/phpstan-prophecy": "^2.1.11",
         "justinrainbow/json-schema": "^6.5.2",
         "laravel/framework": "^11.0 || ^12.0 || ^13.0",
-        "mcp/sdk": ">=0.4 <1.0",
+        "mcp/sdk": "^0.6",
         "orchestra/testbench": "^10.9 || ^11.0",
         "phpspec/prophecy-phpunit": "^2.2",
         "phpstan/extension-installer": "^1.1",

src/Doctrine/Common/State/LinksHandlerTrait.php

@@ -36,10 +36,12 @@ private function getLinks(string $resourceClass, Operation $operation, array $co
 
         if (!($linkClass = $context['linkClass'] ?? false)) {
             // Root item lookup: GraphQl Query.links carries relation links (for nested traversal)
-            // and the identifier-self link. Keep only the identifier-self / self-references so
-            // handleLinks applies WHERE id=X without consuming identifiers via relation joins.
+            // and the identifier-self link. Keep only the identifier-self link so handleLinks
+            // applies WHERE id=X. A relation link always carries a fromProperty/toProperty (even a
+            // self-reference whose toClass equals the resource class, e.g. a ManyToOne to self), so
+            // excluding those prevents consuming the identifier via a bogus relation join.
             if ($operation instanceof GraphQlOperation) {
-                return array_values(array_filter($links, static fn ($l) => null === $l->getToClass() || $l->getToClass() === $resourceClass));
+                return array_values(array_filter($links, static fn ($l) => !$l->getFromProperty() && !$l->getToProperty() && (null === $l->getToClass() || $l->getToClass() === $resourceClass)));
             }
 
             return $links;

src/Mcp/Capability/Registry/Loader.php

@@ -23,7 +23,6 @@
 use Mcp\Capability\Registry\Loader\LoaderInterface;
 use Mcp\Capability\RegistryInterface;
 use Mcp\Schema\Annotations;
-use Mcp\Schema\Resource;
 use Mcp\Schema\ResourceDefinition;
 use Mcp\Schema\Tool;
 use Mcp\Schema\ToolAnnotations;
@@ -73,15 +72,12 @@ public function load(RegistryInterface $registry): void
                                 outputSchema: $outputSchema,
                             ),
                             self::HANDLER,
-                            true,
                         );
                     }
 
                     if ($mcp instanceof McpResource) {
-                        // mcp/sdk 0.6 renamed Mcp\Schema\Resource to ResourceDefinition; support both while symfony/mcp-bundle still pins ^0.5
-                        $resourceClass = class_exists(ResourceDefinition::class) ? ResourceDefinition::class : Resource::class;
                         $registry->registerResource(
-                            new $resourceClass(
+                            new ResourceDefinition(
                                 uri: $mcp->getUri(),
                                 name: $mcp->getName(),
                                 description: $mcp->getDescription(),
@@ -92,7 +88,6 @@ public function load(RegistryInterface $registry): void
                                 meta: $mcp->getMeta()
                             ),
                             self::HANDLER,
-                            true,
                         );
                     }
                 }

src/Mcp/Tests/Capability/Registry/LoaderTest.php

@@ -71,7 +71,6 @@ class: \stdClass::class,
                     return true;
                 }),
                 Loader::HANDLER,
-                true,
             );
 
         $loader = new Loader($nameCollectionFactory, $metadataCollectionFactory, $schemaFactory);
@@ -114,7 +113,6 @@ class: \stdClass::class,
                     return true;
                 }),
                 Loader::HANDLER,
-                true,
             );
 
         $loader = new Loader($nameCollectionFactory, $metadataCollectionFactory, $schemaFactory);
@@ -154,7 +152,6 @@ class: \stdClass::class,
                     return true;
                 }),
                 Loader::HANDLER,
-                true,
             );
 
         $loader = new Loader($nameCollectionFactory, $metadataCollectionFactory, $schemaFactory);

src/Mcp/composer.json

@@ -30,7 +30,7 @@
         "php": ">=8.2",
         "api-platform/metadata": "^4.3",
         "api-platform/json-schema": "^4.3",
-        "mcp/sdk": ">=0.4 <1.0",
+        "mcp/sdk": "^0.6",
         "symfony/object-mapper": "^7.4 || ^8.0",
         "symfony/polyfill-php85": "^1.32"
     },

tests/Fixtures/TestBundle/Entity/GraphQlMappedSelfReference/MappedSelfReference.php

@@ -0,0 +1,45 @@
+<?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\Entity\GraphQlMappedSelfReference;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\GraphQl\Query;
+use ApiPlatform\Metadata\GraphQl\QueryCollection;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ApiResource(
+    operations: [],
+    graphQlOperations: [
+        new Query(),
+        new QueryCollection(),
+    ]
+)]
+#[ORM\Entity]
+class MappedSelfReference
+{
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    public ?int $id = null;
+
+    #[ORM\Column(type: 'string')]
+    public ?string $name = null;
+
+    // A real Doctrine association pointing back to the same resource class. Its
+    // link has toClass === resourceClass, so the GraphQL root-item filter must
+    // not mistake it for the identifier-self link and emit a bogus self-join.
+    #[ORM\ManyToOne(targetEntity: self::class)]
+    #[ORM\JoinColumn(name: 'parent_id', referencedColumnName: 'id', nullable: true)]
+    public ?self $parent = null;
+}

tests/Functional/GraphQl/MappedSelfReferenceTest.php

@@ -0,0 +1,84 @@
+<?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\Functional\GraphQl;
+
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
+use ApiPlatform\Tests\Fixtures\TestBundle\Entity\GraphQlMappedSelfReference\MappedSelfReference;
+use ApiPlatform\Tests\RecreateSchemaTrait;
+use ApiPlatform\Tests\SetupClassResourcesTrait;
+
+/**
+ * A GraphQL item query on a self-referencing entity (a mapped ManyToOne pointing
+ * back to the same resource class) must apply WHERE id=X only. The relation link
+ * has toClass === resourceClass like the identifier-self link, but it must not
+ * survive the root-item filter, otherwise handleLinks emits a bogus self-join
+ * plus an extra WHERE condition and the item always resolves to null.
+ *
+ * @see https://github.com/api-platform/core/issues/8305
+ */
+final class MappedSelfReferenceTest extends ApiTestCase
+{
+    use RecreateSchemaTrait;
+    use SetupClassResourcesTrait;
+
+    protected static ?bool $alwaysBootKernel = false;
+
+    /**
+     * @return class-string[]
+     */
+    public static function getResources(): array
+    {
+        return [MappedSelfReference::class];
+    }
+
+    public function testItemQueryOnMappedSelfReferenceReturnsTheRecord(): void
+    {
+        if ($this->isMongoDB()) {
+            $this->markTestSkipped('MappedSelfReference is ORM-only.');
+        }
+
+        $this->recreateSchema([MappedSelfReference::class]);
+
+        $manager = $this->getManager();
+        $root = new MappedSelfReference();
+        $root->name = 'Root';
+        $manager->persist($root);
+        $child = new MappedSelfReference();
+        $child->name = 'Child';
+        $child->parent = $root;
+        $manager->persist($child);
+        $manager->flush();
+
+        // The child's parent is the root, not itself: the bogus self-join
+        // (WHERE parent.id = child.id) would never match, so this proves the
+        // self-reference link is excluded from the root item lookup.
+        $iri = '/mapped_self_references/'.$child->id;
+
+        $response = self::createClient()->request('POST', '/graphql', ['json' => [
+            'query' => <<<GRAPHQL
+            {
+              mappedSelfReference(id: "{$iri}") {
+                id
+                name
+              }
+            }
+            GRAPHQL,
+        ]]);
+
+        $this->assertResponseIsSuccessful();
+        $json = $response->toArray(false);
+        $this->assertArrayNotHasKey('errors', $json, json_encode($json['errors'] ?? null));
+        $this->assertSame('Child', $json['data']['mappedSelfReference']['name']);
+    }
+}